fix weekly builds

arthenica · Nov 19, 2024 · 00a17e0 · 00a17e0
1 parent ea8e8de
commit 00a17e0
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 41 deletions.
diff --git a/.github/workflows/periodic-builds-android.yml b/.github/workflows/periodic-builds-android.yml
@@ -1,17 +1,18 @@
 name: android nightly builds
 
 on:
-  schedule:
-    - cron:  '0 3 * * 0'
+  push:
+    branches:
+      - github-actions-fix
 
 jobs:
   build-android-main-on-linux:
     name: android main on linux
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux', 'r24-linux', 'r25b-linux' ]
-        branches: [ 'main', 'development' ]
+        ndk-version: [ 'r22b-linux-x86_64' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -25,7 +26,7 @@ jobs:
           distribution: 'adopt'
           java-version: '17'
       - name: prerequisites
-        run: sudo apt-get install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget autopoint meson ninja-build ragel groff gtk-doc-tools libtasn1-bin
+        run: sudo apt-get install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget autopoint meson ninja-build ragel groff gtk-doc-tools libtasn1-bin binutils
       - name: prerequisites 2
         run: ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --uninstall "cmake;3.10.2.4988404" "cmake;3.18.1"
       - name: upgrade meson
@@ -36,7 +37,7 @@ jobs:
           unzip -q -o ndk.zip -d .ndk
           echo "ANDROID_NDK_ROOT=$PWD/.ndk/$(ls .ndk)" >> $GITHUB_ENV
       - name: run the build script
-        run: ./android.sh --full --enable-gpl --disable-lib-srt --disable-arm-v7a
+        run: ./android.sh --enable-lame
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log
@@ -48,8 +49,8 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ndk-version: [ 'r22b-linux-x86_64', 'r23b-linux' ]
-        branches: [ 'main', 'development' ]
+        ndk-version: [ 'r22b-linux-x86_64' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -63,7 +64,7 @@ jobs:
           distribution: 'adopt'
           java-version: '17'
       - name: prerequisites
-        run: sudo apt-get install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget autopoint meson ninja-build ragel groff gtk-doc-tools libtasn1-bin
+        run: sudo apt-get install autoconf automake libtool pkg-config curl git doxygen nasm cmake gcc gperf texinfo yasm bison autogen wget autopoint meson ninja-build ragel groff gtk-doc-tools libtasn1-bin binutils
       - name: prerequisites 2
         run: ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --uninstall "cmake;3.10.2.4988404" "cmake;3.18.1"
       - name: upgrade meson
@@ -74,7 +75,7 @@ jobs:
           unzip -q -o ndk.zip -d .ndk
           echo "ANDROID_NDK_ROOT=$PWD/.ndk/$(ls .ndk)" >> $GITHUB_ENV
       - name: run the build script
-        run: ./android.sh -l --full --enable-gpl --disable-lib-srt
+        run: ./android.sh -l --enable-lame
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log

diff --git a/.github/workflows/periodic-builds-apple.yml b/.github/workflows/periodic-builds-apple.yml
@@ -1,8 +1,9 @@
 name: apple nightly builds
 
 on:
-  schedule:
-    - cron:  '0 1 * * 0'
+  push:
+    branches:
+      - github-actions-fix
 
 jobs:
   build-ios-main-on-macos-sonoma:
@@ -11,7 +12,7 @@ jobs:
     strategy:
       matrix:
         xcode: [ '15.4', '16.0' ]
-        branches: [ 'main', 'development' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -24,20 +25,20 @@ jobs:
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
-        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./ios.sh -x --full --enable-gpl --disable-lib-srt --disable-lib-gnutls
+        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./ios.sh -x --enable-libvorbis
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-ios-lts-on-macos-monterey:
-    name: ios lts on monterey
-    runs-on: macos-12
+  build-ios-lts-on-macos-ventura:
+    name: ios lts on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1' ]
-        branches: [ 'main', 'development' ]
+        xcode: [ '14.3.1' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -50,7 +51,7 @@ jobs:
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
-        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./ios.sh -l --full --enable-gpl --disable-lib-srt --disable-lib-gnutls --disable-armv7s --disable-arm64e --disable-i386
+        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./ios.sh -l --enable-libvorbis --disable-armv7s --disable-arm64e --disable-i386
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log
@@ -63,7 +64,7 @@ jobs:
     strategy:
       matrix:
         xcode: [ '15.4', '16.0' ]
-        branches: [ 'main', 'development' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -76,20 +77,20 @@ jobs:
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
-        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./macos.sh -x --full --enable-gpl --disable-lib-srt --disable-lib-gnutls
+        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./macos.sh -x --enable-libvorbis
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-macos-lts-on-macos-monterey:
-    name: macos lts on monterey
-    runs-on: macos-12
+  build-macos-lts-on-macos-ventura:
+    name: macos lts on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1' ]
-        branches: [ 'main', 'development' ]
+        xcode: [ '14.3.1' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -102,7 +103,7 @@ jobs:
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
-        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./macos.sh -l --full --enable-gpl --disable-lib-srt --disable-lib-gnutls
+        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./macos.sh -l --enable-libvorbis
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log
@@ -115,7 +116,7 @@ jobs:
     strategy:
       matrix:
         xcode: [ '15.4', '16.0' ]
-        branches: [ 'main', 'development' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -128,20 +129,20 @@ jobs:
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
-        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./tvos.sh -x --full --enable-gpl --disable-lib-srt --disable-lib-gnutls
+        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./tvos.sh -x --enable-libvorbis
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log
       - name: print ffbuild logs
         if: ${{ failure() }}
         run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
-  build-tvos-lts-on-macos-monterey:
-    name: tvos lts on monterey
-    runs-on: macos-12
+  build-tvos-lts-on-macos-ventura:
+    name: tvos lts on ventura
+    runs-on: macos-13
     strategy:
       matrix:
-        xcode: [ '13.4.1' ]
-        branches: [ 'main', 'development' ]
+        xcode: [ '14.3.1' ]
+        branches: [ 'github-actions-fix' ]
     defaults:
       run:
         shell: bash
@@ -154,7 +155,7 @@ jobs:
       - name: set up xcode
         run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
       - name: run the build script
-        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./tvos.sh -l --full --enable-gpl --disable-lib-srt --disable-lib-gnutls
+        run: PATH="/usr/local/opt/bison/bin:$PATH" XML_CATALOG_FILES="/usr/local/etc/xml/catalog" ./tvos.sh -l --enable-libvorbis
       - name: print build logs
         if: ${{ always() }}
         run: cat build.log

diff --git a/scripts/android/libiconv.sh b/scripts/android/libiconv.sh
@@ -1,8 +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
-./gitsub.sh pull || 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
+
+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

diff --git a/scripts/apple/libogg.sh b/scripts/apple/libogg.sh
@@ -8,9 +8,6 @@ if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libogg} -e
   autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1
 fi
 
-# FIX INCLUDE PATHS
-${SED_INLINE} 's/sys\/types/stdint/g' ${BASEDIR}/src/libogg/include/ogg/os_types.h
-
 ./configure \
   --prefix="${LIB_INSTALL_PREFIX}" \
   --with-pic \