Skip to content

Commit

Permalink
Upgrade GitHub Actions workflows to macOS 13 and Ubuntu 22.04 LTS (Ja…
Browse files Browse the repository at this point in the history
…mmy)
  • Loading branch information
saudet committed Nov 19, 2024
1 parent 2887bd1 commit f9015bb
Show file tree
Hide file tree
Showing 99 changed files with 834 additions and 762 deletions.
6 changes: 4 additions & 2 deletions .github/actions/deploy-macosx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ runs:
fi
# Change default JVM on macos-14 runner
if [[ -n ${JAVA_HOME_17_arm64:-} ]]; then
export JAVA_HOME=$JAVA_HOME_17_arm64
if [[ -n ${JAVA_HOME_11_arm64:-} ]]; then
export JAVA_HOME=$JAVA_HOME_11_arm64
else
export JAVA_HOME=$JAVA_HOME_8_X64
fi
git --version
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/arpack-ng.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ env:
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
# linux-armhf:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-ppc64le:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-x86:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
macosx-x86_64:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
# windows-x86:
Expand All @@ -53,6 +53,6 @@ jobs:
redeploy:
# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
14 changes: 7 additions & 7 deletions .github/workflows/cminpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ env:
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
# linux-armhf:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-ppc64le:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-x86:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
macosx-x86_64:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
# windows-x86:
Expand All @@ -53,6 +53,6 @@ jobs:
redeploy:
# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
14 changes: 7 additions & 7 deletions .github/workflows/cpython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,31 @@ env:
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
# linux-armhf:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-arm64:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-ppc64le:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-x86:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
macosx-arm64:
runs-on: macos-14
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
macosx-x86_64:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
# windows-x86:
Expand All @@ -56,6 +56,6 @@ jobs:
redeploy:
needs: [linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
10 changes: 5 additions & 5 deletions .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ env:
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-ppc64le:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# macosx-x86_64:
# runs-on: macos-12
# runs-on: macos-13
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
windows-x86_64:
Expand All @@ -41,6 +41,6 @@ jobs:
redeploy:
needs: [linux-arm64, linux-x86_64, windows-x86_64]
# needs: [linux-ppc64le, linux-x86_64, macosx-x86_64, windows-x86_64]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
8 changes: 4 additions & 4 deletions .github/workflows/dnnl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ env:
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
macosx-x86_64:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
windows-x86_64:
Expand All @@ -35,6 +35,6 @@ jobs:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
redeploy:
needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
24 changes: 12 additions & 12 deletions .github/workflows/ffmpeg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,77 +19,77 @@ env:
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
# android-arm:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# strategy:
# matrix:
# ext: ["", -gpl]
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
android-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# android-x86:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# strategy:
# matrix:
# ext: ["", -gpl]
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
android-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-armhf:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# strategy:
# matrix:
# ext: ["", -gpl]
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-ppc64le:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# strategy:
# matrix:
# ext: ["", -gpl]
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-x86:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# strategy:
# matrix:
# ext: ["", -gpl]
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
macosx-arm64:
runs-on: macos-12
runs-on: macos-13
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
macosx-x86_64:
runs-on: macos-12
runs-on: macos-13
strategy:
matrix:
ext: ["", -gpl]
Expand All @@ -112,6 +112,6 @@ jobs:
redeploy:
# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
needs: [android-arm64, android-x86_64, linux-arm64, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
22 changes: 11 additions & 11 deletions .github/workflows/fftw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,43 +19,43 @@ env:
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
jobs:
# android-arm:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
android-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# android-x86:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
android-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-armhf:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-ppc64le:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
# linux-x86:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86_64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
macosx-x86_64:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
# windows-x86:
Expand All @@ -69,6 +69,6 @@ jobs:
redeploy:
# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
needs: [android-arm64, android-x86_64, linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
Loading

0 comments on commit f9015bb

Please sign in to comment.