update github action runners

arthenica · Nov 19, 2024 · 885811c · 885811c
1 parent 9e6b83c
commit 885811c
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 41 deletions.
diff --git a/.github/workflows/android-build-scripts.yml b/.github/workflows/android-build-scripts.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux', 'r24-linux', 'r25c-linux', 'r26d-linux' ]
+        ndk-version: [ 'r22b-linux-x86_64', 'r25c-linux', 'r26d-linux', 'r27c-linux' ]
     defaults:
       run:
         shell: bash
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux' ]
+        ndk-version: [ 'r22b-linux-x86_64' ]
     defaults:
       run:
         shell: bash
@@ -89,10 +89,10 @@ jobs:
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
   build-main-on-macos:
     name: android main on macos
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
       matrix:
-        ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin', 'r24-darwin', 'r25c-darwin', 'r26d-darwin' ]
+        ndk-version: [ 'r22b-darwin-x86_64', 'r25c-darwin', 'r26d-darwin' , 'r27c-darwin' ]
     defaults:
       run:
         shell: bash
@@ -118,10 +118,10 @@ jobs:
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
   build-api-16-on-macos:
     name: android api 16 on macos
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
-        ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin' ]
+        ndk-version: [ 'r22b-darwin-x86_64' ]
     defaults:
       run:
         shell: bash
@@ -150,7 +150,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ndk-version: [ 'r22b-linux-x86_64' ]
+        ndk-version: [ 'r27c-linux' ]
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/ios-build-scripts.yml b/.github/workflows/ios-build-scripts.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '15.4', '16.0' ]
+        xcode: [ '15.3', '15.4' ]
     defaults:
       run:
         shell: bash
@@ -73,12 +73,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-min-sdk-10-on-macos-monterey:
-    name: ios min sdk 10 on monterey
-    runs-on: macos-12
+  build-min-sdk-10-on-macos-ventura:
+    name: ios min sdk 10 on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.2' ]
+        xcode: [ '14.3.1', '15.2' ]
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/macos-build-scripts.yml b/.github/workflows/macos-build-scripts.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '15.4', '16.0' ]
+        xcode: [ '15.3', '15.4' ]
     defaults:
       run:
         shell: bash
@@ -73,12 +73,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-min-sdk-1012-on-macos-monterey:
-    name: macos min sdk 10.12 on monterey
-    runs-on: macos-12
+  build-min-sdk-1012-on-macos-ventura:
+    name: macos min sdk 10.12 on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.2' ]
+        xcode: [ '14.3.1', '15.2' ]
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/periodic-builds-android.yml b/.github/workflows/periodic-builds-android.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux', 'r24-linux', 'r25c-linux', 'r26d-linux' ]
+        ndk-version: [ 'r22b-linux-x86_64', 'r25c-linux', 'r26d-linux' , 'r27c-linux' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux' ]
+        ndk-version: [ 'r22b-linux-x86_64' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:

diff --git a/.github/workflows/periodic-builds-apple.yml b/.github/workflows/periodic-builds-apple.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '15.4', '16.0' ]
+        xcode: [ '15.3', '15.4' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -31,12 +31,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-ios-min-sdk-10-on-macos-monterey:
-    name: ios min sdk 10 on monterey
-    runs-on: macos-12
+  build-ios-min-sdk-10-on-macos-ventura:
+    name: ios min sdk 10 on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1' ]
+        xcode: [ '15.2' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -62,7 +62,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '15.4', '16.0' ]
+        xcode: [ '15.3', '15.4' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -83,12 +83,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-macos-min-sdk-1012-on-macos-monterey:
-    name: macos min sdk 10.12 on monterey
-    runs-on: macos-12
+  build-macos-min-sdk-1012-on-macos-ventura:
+    name: macos min sdk 10.12 on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1' ]
+        xcode: [ '15.2' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -114,7 +114,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '15.4', '16.0' ]
+        xcode: [ '15.3', '15.4' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:
@@ -135,12 +135,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-tvos-min-sdk-100-on-macos-monterey:
-    name: tvos min sdk 10.0 on monterey
-    runs-on: macos-12
+  build-tvos-min-sdk-100-on-macos-ventura:
+    name: tvos min sdk 10.0 on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1' ]
+        xcode: [ '15.2' ]
         branches: [ 'main', 'development' ]
     defaults:
       run:

diff --git a/.github/workflows/tvos-build-scripts.yml b/.github/workflows/tvos-build-scripts.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        xcode: [ '15.4', '16.0' ]
+        xcode: [ '15.3', '15.4' ]
     defaults:
       run:
         shell: bash
@@ -73,12 +73,12 @@ jobs:
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-min-sdk-100-on-macos-monterey:
-    name: tvos min sdk 10.0 on monterey
-    runs-on: macos-12
+  build-min-sdk-100-on-macos-ventura:
+    name: tvos min sdk 10.0 on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1', '14.2' ]
+        xcode: [ '15.2' ]
     defaults:
       run:
         shell: bash

diff --git a/scripts/android/libiconv.sh b/scripts/android/libiconv.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 
-# INIT SUBMODULES
+# FIX HARD-CODED PATHS
 ${SED_INLINE} 's|git://git.savannah.gnu.org|https://github.com/arthenica|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1
 ln -s -f $(which aclocal) ${BASEDIR}/.tmp/aclocal-1.16
 ln -s -f $(which automake) ${BASEDIR}/.tmp/automake-1.16
 PATH="${BASEDIR}/.tmp":$PATH
-./gitsub.sh pull || return 1
+
+if [[ ! -d "${BASEDIR}"/src/"${LIB_NAME}"/gnulib ]]; then
+
+  # INIT SUBMODULES
+  ./gitsub.sh pull || return 1
+  ./gitsub.sh checkout gnulib 485d983b7795548fb32b12fbe8370d40789e88c4 || return 1
+fi
 
 # ALWAYS CLEAN THE PREVIOUS BUILD
 make distclean 2>/dev/null 1>/dev/null