Skip to content

Commit a462f13

Browse files
committed
Upgrade GitHub Actions workflows to macOS 13 and Ubuntu 22.04 LTS (Jammy)
1 parent 2887bd1 commit a462f13

27 files changed

+198
-196
lines changed

.github/actions/deploy-macosx/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,10 @@ runs:
108108
fi
109109
110110
# Change default JVM on macos-14 runner
111-
if [[ -n ${JAVA_HOME_17_arm64:-} ]]; then
112-
export JAVA_HOME=$JAVA_HOME_17_arm64
111+
if [[ -n ${JAVA_HOME_11_arm64:-} ]]; then
112+
export JAVA_HOME=$JAVA_HOME_11_arm64
113+
else
114+
export JAVA_HOME=$JAVA_HOME_8_X64
113115
fi
114116
115117
git --version

.github/workflows/arpack-ng.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ env:
1919
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
2020
jobs:
2121
# linux-armhf:
22-
# runs-on: ubuntu-20.04
22+
# runs-on: ubuntu-22.04
2323
# steps:
2424
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2525
linux-arm64:
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-22.04
2727
steps:
2828
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2929
# linux-ppc64le:
30-
# runs-on: ubuntu-20.04
30+
# runs-on: ubuntu-22.04
3131
# steps:
3232
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3333
# linux-x86:
34-
# runs-on: ubuntu-20.04
34+
# runs-on: ubuntu-22.04
3535
# steps:
3636
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3737
linux-x86_64:
38-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-22.04
3939
steps:
4040
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4141
macosx-x86_64:
42-
runs-on: macos-12
42+
runs-on: macos-13
4343
steps:
4444
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
4545
# windows-x86:
@@ -53,6 +53,6 @@ jobs:
5353
redeploy:
5454
# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
5555
needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
56-
runs-on: ubuntu-20.04
56+
runs-on: ubuntu-22.04
5757
steps:
5858
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

.github/workflows/cminpack.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ env:
1919
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
2020
jobs:
2121
# linux-armhf:
22-
# runs-on: ubuntu-20.04
22+
# runs-on: ubuntu-22.04
2323
# steps:
2424
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2525
linux-arm64:
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-22.04
2727
steps:
2828
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2929
# linux-ppc64le:
30-
# runs-on: ubuntu-20.04
30+
# runs-on: ubuntu-22.04
3131
# steps:
3232
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3333
# linux-x86:
34-
# runs-on: ubuntu-20.04
34+
# runs-on: ubuntu-22.04
3535
# steps:
3636
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3737
linux-x86_64:
38-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-22.04
3939
steps:
4040
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4141
macosx-x86_64:
42-
runs-on: macos-12
42+
runs-on: macos-13
4343
steps:
4444
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
4545
# windows-x86:
@@ -53,6 +53,6 @@ jobs:
5353
redeploy:
5454
# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
5555
needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
56-
runs-on: ubuntu-20.04
56+
runs-on: ubuntu-22.04
5757
steps:
5858
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

.github/workflows/cpython.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,31 @@ env:
1818
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
1919
jobs:
2020
# linux-armhf:
21-
# runs-on: ubuntu-20.04
21+
# runs-on: ubuntu-22.04
2222
# steps:
2323
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2424
# linux-arm64:
25-
# runs-on: ubuntu-20.04
25+
# runs-on: ubuntu-22.04
2626
# steps:
2727
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2828
# linux-ppc64le:
29-
# runs-on: ubuntu-20.04
29+
# runs-on: ubuntu-22.04
3030
# steps:
3131
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3232
# linux-x86:
33-
# runs-on: ubuntu-20.04
33+
# runs-on: ubuntu-22.04
3434
# steps:
3535
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3636
linux-x86_64:
37-
runs-on: ubuntu-20.04
37+
runs-on: ubuntu-22.04
3838
steps:
3939
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4040
macosx-arm64:
4141
runs-on: macos-14
4242
steps:
4343
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
4444
macosx-x86_64:
45-
runs-on: macos-12
45+
runs-on: macos-13
4646
steps:
4747
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
4848
# windows-x86:
@@ -56,6 +56,6 @@ jobs:
5656
redeploy:
5757
needs: [linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
5858
# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
59-
runs-on: ubuntu-20.04
59+
runs-on: ubuntu-22.04
6060
steps:
6161
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

.github/workflows/cuda.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ env:
1919
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
2020
jobs:
2121
linux-arm64:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2323
steps:
2424
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2525
# linux-ppc64le:
26-
# runs-on: ubuntu-20.04
26+
# runs-on: ubuntu-22.04
2727
# steps:
2828
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2929
linux-x86_64:
30-
runs-on: ubuntu-20.04
30+
runs-on: ubuntu-22.04
3131
steps:
3232
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3333
# macosx-x86_64:
34-
# runs-on: macos-12
34+
# runs-on: macos-13
3535
# steps:
3636
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
3737
windows-x86_64:
@@ -41,6 +41,6 @@ jobs:
4141
redeploy:
4242
needs: [linux-arm64, linux-x86_64, windows-x86_64]
4343
# needs: [linux-ppc64le, linux-x86_64, macosx-x86_64, windows-x86_64]
44-
runs-on: ubuntu-20.04
44+
runs-on: ubuntu-22.04
4545
steps:
4646
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

.github/workflows/dnnl.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ env:
1818
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
1919
jobs:
2020
linux-arm64:
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2222
steps:
2323
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2424
linux-x86_64:
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2828
macosx-x86_64:
29-
runs-on: macos-12
29+
runs-on: macos-13
3030
steps:
3131
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
3232
windows-x86_64:
@@ -35,6 +35,6 @@ jobs:
3535
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
3636
redeploy:
3737
needs: [linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
38-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-22.04
3939
steps:
4040
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

.github/workflows/ffmpeg.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,77 +19,77 @@ env:
1919
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
2020
jobs:
2121
# android-arm:
22-
# runs-on: ubuntu-20.04
22+
# runs-on: ubuntu-22.04
2323
# strategy:
2424
# matrix:
2525
# ext: ["", -gpl]
2626
# steps:
2727
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2828
android-arm64:
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-22.04
3030
strategy:
3131
matrix:
3232
ext: ["", -gpl]
3333
steps:
3434
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3535
# android-x86:
36-
# runs-on: ubuntu-20.04
36+
# runs-on: ubuntu-22.04
3737
# strategy:
3838
# matrix:
3939
# ext: ["", -gpl]
4040
# steps:
4141
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4242
android-x86_64:
43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4444
strategy:
4545
matrix:
4646
ext: ["", -gpl]
4747
steps:
4848
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4949
# linux-armhf:
50-
# runs-on: ubuntu-20.04
50+
# runs-on: ubuntu-22.04
5151
# strategy:
5252
# matrix:
5353
# ext: ["", -gpl]
5454
# steps:
5555
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
5656
linux-arm64:
57-
runs-on: ubuntu-20.04
57+
runs-on: ubuntu-22.04
5858
strategy:
5959
matrix:
6060
ext: ["", -gpl]
6161
steps:
6262
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
6363
# linux-ppc64le:
64-
# runs-on: ubuntu-20.04
64+
# runs-on: ubuntu-22.04
6565
# strategy:
6666
# matrix:
6767
# ext: ["", -gpl]
6868
# steps:
6969
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
7070
# linux-x86:
71-
# runs-on: ubuntu-20.04
71+
# runs-on: ubuntu-22.04
7272
# strategy:
7373
# matrix:
7474
# ext: ["", -gpl]
7575
# steps:
7676
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
7777
linux-x86_64:
78-
runs-on: ubuntu-20.04
78+
runs-on: ubuntu-22.04
7979
strategy:
8080
matrix:
8181
ext: ["", -gpl]
8282
steps:
8383
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
8484
macosx-arm64:
85-
runs-on: macos-12
85+
runs-on: macos-13
8686
strategy:
8787
matrix:
8888
ext: ["", -gpl]
8989
steps:
9090
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
9191
macosx-x86_64:
92-
runs-on: macos-12
92+
runs-on: macos-13
9393
strategy:
9494
matrix:
9595
ext: ["", -gpl]
@@ -112,6 +112,6 @@ jobs:
112112
redeploy:
113113
# 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]
114114
needs: [android-arm64, android-x86_64, linux-arm64, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
115-
runs-on: ubuntu-20.04
115+
runs-on: ubuntu-22.04
116116
steps:
117117
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

.github/workflows/fftw.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,43 @@ env:
1919
STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
2020
jobs:
2121
# android-arm:
22-
# runs-on: ubuntu-20.04
22+
# runs-on: ubuntu-22.04
2323
# steps:
2424
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2525
android-arm64:
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-22.04
2727
steps:
2828
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2929
# android-x86:
30-
# runs-on: ubuntu-20.04
30+
# runs-on: ubuntu-22.04
3131
# steps:
3232
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3333
android-x86_64:
34-
runs-on: ubuntu-20.04
34+
runs-on: ubuntu-22.04
3535
steps:
3636
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
3737
# linux-armhf:
38-
# runs-on: ubuntu-20.04
38+
# runs-on: ubuntu-22.04
3939
# steps:
4040
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4141
linux-arm64:
42-
runs-on: ubuntu-20.04
42+
runs-on: ubuntu-22.04
4343
steps:
4444
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4545
# linux-ppc64le:
46-
# runs-on: ubuntu-20.04
46+
# runs-on: ubuntu-22.04
4747
# steps:
4848
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4949
# linux-x86:
50-
# runs-on: ubuntu-20.04
50+
# runs-on: ubuntu-22.04
5151
# steps:
5252
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
5353
linux-x86_64:
54-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-22.04
5555
steps:
5656
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
5757
macosx-x86_64:
58-
runs-on: macos-12
58+
runs-on: macos-13
5959
steps:
6060
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
6161
# windows-x86:
@@ -69,6 +69,6 @@ jobs:
6969
redeploy:
7070
# 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]
7171
needs: [android-arm64, android-x86_64, linux-arm64, linux-x86_64, macosx-x86_64, windows-x86_64]
72-
runs-on: ubuntu-20.04
72+
runs-on: ubuntu-22.04
7373
steps:
7474
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

0 commit comments

Comments
 (0)