Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@tanersener
tanersener committed Apr 20, 2024
2 parents b8bbee0 + 3b054eb commit f0f16b7
Show file tree
Hide file tree
Showing 12 changed files with 121 additions and 118 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/android-build-scripts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: set up adopt jdk 17
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: set up adopt jdk 17
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: set up adopt jdk 17
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: set up adopt jdk 17
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: set up adopt jdk 17
uses: actions/setup-java@v3
with:
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/ios-build-scripts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ on:
- 'ios.sh'

jobs:
build-main-on-macos-monterey:
name: ios main on monterey
runs-on: macos-12
build-main-on-macos-sonoma:
name: ios main on sonoma
runs-on: macos-14
strategy:
matrix:
xcode: [ '13.4.1', '14.0.1' ]
xcode: [ '14.3.1', '15.3' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: brew install autoconf automake libtool pkg-config curl git cmake nasm
- name: set up xcode
Expand All @@ -50,17 +50,17 @@ 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-bigsur:
name: ios main on big sur
runs-on: macos-11
build-main-on-macos-ventura:
name: ios main on ventura
runs-on: macos-13
strategy:
matrix:
xcode: [ '12.5.1', '13.2.1' ]
xcode: [ '14.3.1', '15.2' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: brew install autoconf automake libtool pkg-config curl git cmake nasm
- name: set up xcode
Expand All @@ -73,17 +73,17 @@ jobs:
- name: print ffbuild logs
if: ${{ failure() }}
run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
build-lts-on-macos-bigsur:
name: ios lts on big sur
runs-on: macos-11
build-lts-on-macos-monterey:
name: ios lts on monterey
runs-on: macos-12
strategy:
matrix:
xcode: [ '11.7', '12.4' ]
xcode: [ '13.4.1', '14.2' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: brew install autoconf automake libtool pkg-config curl git cmake nasm
- name: set up xcode
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux-build-scripts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: sudo apt-get install clang llvm lld libclang-14-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
- name: run the build script
Expand All @@ -48,7 +48,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: sudo apt-get install clang llvm lld libclang-14-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
- name: run the build script
Expand All @@ -66,7 +66,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
- name: run the build script
Expand All @@ -84,7 +84,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: sudo apt-get install clang llvm lld libclang-11-dev libstdc++6 nasm autoconf automake libtool pkg-config curl git doxygen rapidjson-dev
- name: run the build script
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/macos-build-scripts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ on:
- 'macos.sh'

jobs:
build-main-on-macos-monterey:
name: macos main on monterey
runs-on: macos-12
build-main-on-macos-sonoma:
name: macos main on sonoma
runs-on: macos-14
strategy:
matrix:
xcode: [ '13.4.1', '14.0.1' ]
xcode: [ '14.3.1', '15.3' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: brew install autoconf automake libtool pkg-config curl git cmake nasm
- name: set up xcode
Expand All @@ -50,17 +50,17 @@ 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-bigsur:
name: macos main on big sur
runs-on: macos-11
build-main-on-macos-ventura:
name: macos main on ventura
runs-on: macos-13
strategy:
matrix:
xcode: [ '12.5.1', '13.2.1' ]
xcode: [ '14.3.1', '15.2' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: brew install autoconf automake libtool pkg-config curl git cmake nasm
- name: set up xcode
Expand All @@ -73,17 +73,17 @@ jobs:
- name: print ffbuild logs
if: ${{ failure() }}
run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
build-lts-on-macos-bigsur:
name: macos lts on big sur
runs-on: macos-11
build-lts-on-macos-monterey:
name: macos lts on monterey
runs-on: macos-12
strategy:
matrix:
xcode: [ '11.7', '12.4' ]
xcode: [ '13.4.1', '14.2' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: prerequisites
run: brew install autoconf automake libtool pkg-config curl git cmake nasm
- name: set up xcode
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/periodic-builds-android.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: set up adopt jdk 17
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: set up adopt jdk 17
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/periodic-builds-apple.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ on:
- cron: '0 1 * * 0'

jobs:
build-ios-main-on-macos-ventura:
name: ios main on ventura
runs-on: macos-13
build-ios-main-on-macos-sonoma:
name: ios main on sonoma
runs-on: macos-14
strategy:
matrix:
xcode: [ '14.3.1' ]
xcode: [ '14.3.1', '15.3' ]
branches: [ 'main', 'development' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: prerequisites
Expand All @@ -36,13 +36,13 @@ jobs:
runs-on: macos-12
strategy:
matrix:
xcode: [ '14.2' ]
xcode: [ '13.4.1' ]
branches: [ 'main', 'development' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: prerequisites
Expand All @@ -57,18 +57,18 @@ jobs:
- name: print ffbuild logs
if: ${{ failure() }}
run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
build-macos-main-on-macos-ventura:
name: macos main on ventura
runs-on: macos-13
build-macos-main-on-macos-sonoma:
name: macos main on sonoma
runs-on: macos-14
strategy:
matrix:
xcode: [ '14.3.1' ]
xcode: [ '14.3.1', '15.3' ]
branches: [ 'main', 'development' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: prerequisites
Expand All @@ -88,13 +88,13 @@ jobs:
runs-on: macos-12
strategy:
matrix:
xcode: [ '14.2' ]
xcode: [ '13.4.1' ]
branches: [ 'main', 'development' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: prerequisites
Expand All @@ -109,18 +109,18 @@ jobs:
- name: print ffbuild logs
if: ${{ failure() }}
run: '[[ -f ./src/ffmpeg/ffbuild/config.log ]] && tail -50 ./src/ffmpeg/ffbuild/config.log'
build-tvos-main-on-macos-ventura:
name: tvos main on ventura
runs-on: macos-13
build-tvos-main-on-macos-sonoma:
name: tvos main on sonoma
runs-on: macos-14
strategy:
matrix:
xcode: [ '14.3.1' ]
xcode: [ '14.3.1', '15.3' ]
branches: [ 'main', 'development' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: prerequisites
Expand All @@ -140,13 +140,13 @@ jobs:
runs-on: macos-12
strategy:
matrix:
xcode: [ '14.2' ]
xcode: [ '13.4.1' ]
branches: [ 'main', 'development' ]
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branches }}
- name: prerequisites
Expand Down
Loading

0 comments on commit f0f16b7

Please sign in to comment.