Merge branch 'master' into feature/m128.6613

shiguredo-webrtc-build · Aug 22, 2024 · 375a245 · 375a245
2 parents 146509d + e93d0bf
commit 375a245
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -119,7 +119,7 @@ jobs:
           - name: ubuntu-24.04_x86_64
             runs-on: ubuntu-24.04
           - name: android
-            runs-on: ubuntu-20.04
+            runs-on: ubuntu-22.04
     runs-on: ${{ matrix.platform.runs-on }}
     steps:
       - uses: actions/checkout@v4

diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,11 @@
 VERSION ファイルを上げただけの場合は変更履歴記録は不要。
 パッチやビルドの変更のみ記録すること。
 
+## 2024-08-19
+
+- [UPDATE] GitHub Actions Android のビルド環境を Ubuntu 22.04 に上げる
+  - @zztkm
+
 ## 2024-06-21
 
 - [ADD] Ubuntu 24.04 に対応

diff --git a/README.md b/README.md
@@ -45,11 +45,12 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
   - Jetson AGX Xavier
   - Jetson Orin NX
   - Jetson AGX Orin
-- ubuntu-22.04_armv8 (動作未確認)
+- ubuntu-22.04_armv8
   - Jetson AGX Orin
   - Jetson Orin Nano
 - ubuntu-20.04_x86_64
 - ubuntu-22.04_x86_64
+- ubuntu-24.04_x86_64
 - android_arm64
 - ios_arm64