From 15a5d1fb9a8e3c7a5d4527e82e90eaf5a7f78f37 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Fri, 21 Oct 2022 22:40:54 +0100 Subject: [PATCH] decommission macos 10-15 in github workflows --- .github/workflows/android-build-scripts.yml | 4 +-- .github/workflows/ios-build-scripts.yml | 29 +++------------------ .github/workflows/macos-build-scripts.yml | 29 +++------------------ .github/workflows/periodic-builds-apple.yml | 18 ++++++------- .github/workflows/tvos-build-scripts.yml | 29 +++------------------ 5 files changed, 20 insertions(+), 89 deletions(-) diff --git a/.github/workflows/android-build-scripts.yml b/.github/workflows/android-build-scripts.yml index e91cd46..b60e25a 100644 --- a/.github/workflows/android-build-scripts.yml +++ b/.github/workflows/android-build-scripts.yml @@ -85,7 +85,7 @@ 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-10.15 + runs-on: macos-12 strategy: matrix: ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin', 'r24-darwin', 'r25b-darwin' ] @@ -114,7 +114,7 @@ jobs: run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log' build-lts-on-macos: name: android lts on macos - runs-on: macos-10.15 + runs-on: macos-11 strategy: matrix: ndk-version: [ 'r22b-darwin-x86_64', 'r23b-darwin' ] diff --git a/.github/workflows/ios-build-scripts.yml b/.github/workflows/ios-build-scripts.yml index 729f983..29d8978 100644 --- a/.github/workflows/ios-build-scripts.yml +++ b/.github/workflows/ios-build-scripts.yml @@ -73,38 +73,15 @@ jobs: - name: print ffbuild logs if: ${{ failure() }} run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log' - build-main-on-macos-catalina: - name: ios main on catalina - runs-on: macos-10.15 + build-lts-on-macos-bigsur: + name: ios lts on big sur + runs-on: macos-11 strategy: matrix: xcode: [ '11.7', '12.4' ] defaults: run: shell: bash - steps: - - uses: actions/checkout@v2 - - name: prerequisites - run: brew install autoconf automake libtool pkg-config curl git cmake nasm - - 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: ./ios.sh --xcframework --enable-ios-audiotoolbox --enable-ios-avfoundation --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-videotoolbox --enable-ios-zlib - - 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-lts-on-macos: - name: ios lts - runs-on: macos-10.15 - strategy: - matrix: - xcode: [ '10.3', '11.7' ] - defaults: - run: - shell: bash steps: - uses: actions/checkout@v2 - name: prerequisites diff --git a/.github/workflows/macos-build-scripts.yml b/.github/workflows/macos-build-scripts.yml index cfca086..fb2d35b 100644 --- a/.github/workflows/macos-build-scripts.yml +++ b/.github/workflows/macos-build-scripts.yml @@ -73,38 +73,15 @@ jobs: - name: print ffbuild logs if: ${{ failure() }} run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log' - build-main-on-macos-catalina: - name: macos main on catalina - runs-on: macos-10.15 + build-lts-on-macos-bigsur: + name: macos lts on big sur + runs-on: macos-11 strategy: matrix: xcode: [ '11.7', '12.4' ] defaults: run: shell: bash - steps: - - uses: actions/checkout@v2 - - name: prerequisites - run: brew install autoconf automake libtool pkg-config curl git cmake nasm - - 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: ./macos.sh --xcframework --enable-macos-audiotoolbox --enable-macos-avfoundation --enable-macos-bzip2 --enable-macos-coreimage --enable-macos-libiconv --enable-macos-opencl --enable-macos-opengl --enable-macos-videotoolbox --enable-macos-zlib - - 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-lts-on-macos: - name: macos lts - runs-on: macos-10.15 - strategy: - matrix: - xcode: [ '10.3', '11.7' ] - defaults: - run: - shell: bash steps: - uses: actions/checkout@v2 - name: prerequisites diff --git a/.github/workflows/periodic-builds-apple.yml b/.github/workflows/periodic-builds-apple.yml index 6099d07..d9d480b 100644 --- a/.github/workflows/periodic-builds-apple.yml +++ b/.github/workflows/periodic-builds-apple.yml @@ -31,9 +31,9 @@ jobs: - 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-catalina: - name: ios lts on catalina - runs-on: macos-10.15 + build-ios-lts-on-macos-bigsur: + name: ios lts on big sur + runs-on: macos-11 strategy: matrix: xcode: [ '12.4' ] @@ -83,9 +83,9 @@ jobs: - 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-catalina: - name: macos lts on catalina - runs-on: macos-10.15 + build-macos-lts-on-macos-bigsur: + name: macos lts on big sur + runs-on: macos-11 strategy: matrix: xcode: [ '12.4' ] @@ -135,9 +135,9 @@ jobs: - 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-catalina: - name: tvos lts on catalina - runs-on: macos-10.15 + build-tvos-lts-on-macos-bigsur: + name: tvos lts on big sur + runs-on: macos-11 strategy: matrix: xcode: [ '12.4' ] diff --git a/.github/workflows/tvos-build-scripts.yml b/.github/workflows/tvos-build-scripts.yml index c5e3c0a..1169942 100644 --- a/.github/workflows/tvos-build-scripts.yml +++ b/.github/workflows/tvos-build-scripts.yml @@ -73,38 +73,15 @@ jobs: - name: print ffbuild logs if: ${{ failure() }} run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log' - build-main-on-macos-catalina: - name: tvos main on catalina - runs-on: macos-10.15 + build-lts-on-macos-bigsur: + name: tvos lts on big sur + runs-on: macos-11 strategy: matrix: xcode: [ '11.7', '12.4' ] defaults: run: shell: bash - steps: - - uses: actions/checkout@v2 - - name: prerequisites - run: brew install autoconf automake libtool pkg-config curl git cmake nasm - - 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: ./tvos.sh --xcframework --enable-tvos-bzip2 --enable-tvos-audiotoolbox --enable-tvos-libiconv --enable-tvos-videotoolbox --enable-tvos-zlib - - 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-lts-on-macos: - name: tvos lts - runs-on: macos-10.15 - strategy: - matrix: - xcode: [ '10.3', '11.7' ] - defaults: - run: - shell: bash steps: - uses: actions/checkout@v2 - name: prerequisites