From d3a04bf0acb813b48f6c487ab8cc269aa7ecfed2 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Thu, 2 May 2024 18:05:34 +0900 Subject: [PATCH] Upgrade GitHub Actions workflows to macOS 12 --- .github/actions/deploy-macosx/action.yml | 2 +- .github/workflows/arpack-ng.yml | 2 +- .github/workflows/bullet.yml | 2 +- .github/workflows/cminpack.yml | 2 +- .github/workflows/cpython.yml | 2 +- .github/workflows/cuda.yml | 2 +- .github/workflows/dnnl.yml | 2 +- .github/workflows/ffmpeg.yml | 4 ++-- .github/workflows/fftw.yml | 2 +- .github/workflows/gsl.yml | 2 +- .github/workflows/leptonica.yml | 4 ++-- .github/workflows/libffi.yml | 4 ++-- .github/workflows/llvm.yml | 6 +++--- .github/workflows/mkl.yml | 2 +- .github/workflows/numpy.yml | 2 +- .github/workflows/onnx.yml | 2 +- .github/workflows/onnxruntime.yml | 2 +- .github/workflows/openblas.yml | 8 ++++---- .github/workflows/opencl.yml | 2 +- .github/workflows/opencv.yml | 8 ++++---- .github/workflows/pytorch.yml | 4 ++-- .github/workflows/scipy.yml | 2 +- .github/workflows/sentencepiece.yml | 4 ++-- .github/workflows/systems.yml | 2 +- .github/workflows/tensorflow-lite.yml | 2 +- .github/workflows/tesseract.yml | 4 ++-- .github/workflows/tvm.yml | 2 +- bullet/README.md | 4 ++-- bullet/platform/pom.xml | 2 +- bullet/pom.xml | 2 +- bullet/samples/pom.xml | 4 ++-- 31 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml index 971dabd612a..67826c7676c 100644 --- a/.github/actions/deploy-macosx/action.yml +++ b/.github/actions/deploy-macosx/action.yml @@ -24,7 +24,7 @@ runs: sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/MacOSX10* fi - brew uninstall --force --ignore-dependencies gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 little-cms2 maven openblas r + brew uninstall --force --ignore-dependencies gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 gcc@13 little-cms2 maven openblas r brew install boost ccache swig autoconf-archive automake cmake libomp libtool libusb ant nasm xz pkg-config sdl2 gpg1 bison flex perl ragel binutils gradle gmp isl libmpc mpfr geoip pcre ssdeep yajl brew link --force libomp diff --git a/.github/workflows/arpack-ng.yml b/.github/workflows/arpack-ng.yml index cd3f5e43f0a..d43b5cc9e9c 100644 --- a/.github/workflows/arpack-ng.yml +++ b/.github/workflows/arpack-ng.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/bullet.yml b/.github/workflows/bullet.yml index 86d64b5c2f5..38d342a1889 100644 --- a/.github/workflows/bullet.yml +++ b/.github/workflows/bullet.yml @@ -42,7 +42,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/cminpack.yml b/.github/workflows/cminpack.yml index 657d21d1c68..5cde321910c 100644 --- a/.github/workflows/cminpack.yml +++ b/.github/workflows/cminpack.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/cpython.yml b/.github/workflows/cpython.yml index 94a400cc737..8460189da61 100644 --- a/.github/workflows/cpython.yml +++ b/.github/workflows/cpython.yml @@ -38,7 +38,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 2402700a78f..9dee75c3d69 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -31,7 +31,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # macosx-x86_64: -# runs-on: macos-11 +# runs-on: macos-12 # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/dnnl.yml b/.github/workflows/dnnl.yml index 5f07df38198..92b609f89bd 100644 --- a/.github/workflows/dnnl.yml +++ b/.github/workflows/dnnl.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index fd35cb5b8af..aa268212856 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -82,14 +82,14 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 strategy: matrix: ext: ["", -gpl] steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 strategy: matrix: ext: ["", -gpl] diff --git a/.github/workflows/fftw.yml b/.github/workflows/fftw.yml index fbe458af9b3..c7d10ac0cf1 100644 --- a/.github/workflows/fftw.yml +++ b/.github/workflows/fftw.yml @@ -55,7 +55,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/gsl.yml b/.github/workflows/gsl.yml index 91d2a9983bd..f62c2c2fb07 100644 --- a/.github/workflows/gsl.yml +++ b/.github/workflows/gsl.yml @@ -55,7 +55,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/leptonica.yml b/.github/workflows/leptonica.yml index f73e1624d5d..fe2aaf4a060 100644 --- a/.github/workflows/leptonica.yml +++ b/.github/workflows/leptonica.yml @@ -55,11 +55,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/libffi.yml b/.github/workflows/libffi.yml index e37dd707591..d37833586ee 100644 --- a/.github/workflows/libffi.yml +++ b/.github/workflows/libffi.yml @@ -54,11 +54,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml index a71bb80332a..f7c66746c8e 100644 --- a/.github/workflows/llvm.yml +++ b/.github/workflows/llvm.yml @@ -38,11 +38,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: @@ -67,7 +67,7 @@ jobs: needs: redeploy strategy: matrix: - os: [ubuntu-20.04, macos-11, windows-2019] + os: [ubuntu-20.04, macos-12, windows-2019] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/mkl.yml b/.github/workflows/mkl.yml index b462ed15df8..9008cb80383 100644 --- a/.github/workflows/mkl.yml +++ b/.github/workflows/mkl.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions # macosx-x86_64: -# runs-on: macos-11 +# runs-on: macos-12 # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/numpy.yml b/.github/workflows/numpy.yml index 2a9e5b9989e..38ebf4c138f 100644 --- a/.github/workflows/numpy.yml +++ b/.github/workflows/numpy.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/onnx.yml b/.github/workflows/onnx.yml index 3def750ce8b..9f491db2414 100644 --- a/.github/workflows/onnx.yml +++ b/.github/workflows/onnx.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/onnxruntime.yml b/.github/workflows/onnxruntime.yml index 60c8f52e1d0..56ad68a05d7 100644 --- a/.github/workflows/onnxruntime.yml +++ b/.github/workflows/onnxruntime.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 # strategy: # matrix: # ext: ["", -gpu] diff --git a/.github/workflows/openblas.yml b/.github/workflows/openblas.yml index 4cbe65c679f..aad1a112d4f 100644 --- a/.github/workflows/openblas.yml +++ b/.github/workflows/openblas.yml @@ -35,11 +35,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions ios-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions ios-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # linux-armhf: @@ -63,11 +63,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/opencl.yml b/.github/workflows/opencl.yml index 08f7467aa88..c4f660414ab 100644 --- a/.github/workflows/opencl.yml +++ b/.github/workflows/opencl.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/opencv.yml b/.github/workflows/opencv.yml index 05dc50eacd8..742c9d1a56f 100644 --- a/.github/workflows/opencv.yml +++ b/.github/workflows/opencv.yml @@ -35,11 +35,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions ios-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions ios-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # linux-armhf: @@ -66,11 +66,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/pytorch.yml b/.github/workflows/pytorch.yml index cbd42b2dfbe..c0916d62689 100644 --- a/.github/workflows/pytorch.yml +++ b/.github/workflows/pytorch.yml @@ -33,11 +33,11 @@ jobs: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions timeout-minutes: 350 macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 # strategy: # matrix: # ext: ["", -gpu] diff --git a/.github/workflows/scipy.yml b/.github/workflows/scipy.yml index 96666656ee3..7b647faf297 100644 --- a/.github/workflows/scipy.yml +++ b/.github/workflows/scipy.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/sentencepiece.yml b/.github/workflows/sentencepiece.yml index 7698a79b801..e372f98d68a 100644 --- a/.github/workflows/sentencepiece.yml +++ b/.github/workflows/sentencepiece.yml @@ -26,11 +26,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/systems.yml b/.github/workflows/systems.yml index b3d1b169339..1ea1acb8d8c 100644 --- a/.github/workflows/systems.yml +++ b/.github/workflows/systems.yml @@ -38,7 +38,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/tensorflow-lite.yml b/.github/workflows/tensorflow-lite.yml index c71a7cb9cfc..43c2ac9d147 100644 --- a/.github/workflows/tensorflow-lite.yml +++ b/.github/workflows/tensorflow-lite.yml @@ -50,7 +50,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/tesseract.yml b/.github/workflows/tesseract.yml index fef3f5c88f7..13d918aff32 100644 --- a/.github/workflows/tesseract.yml +++ b/.github/workflows/tesseract.yml @@ -55,11 +55,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-arm64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions # windows-x86: diff --git a/.github/workflows/tvm.yml b/.github/workflows/tvm.yml index bd7f8917f13..70a239ba743 100644 --- a/.github/workflows/tvm.yml +++ b/.github/workflows/tvm.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-11 + runs-on: macos-12 # strategy: # matrix: # ext: ["", -gpu] diff --git a/bullet/README.md b/bullet/README.md index 144e4a91f78..53c55ef9afd 100644 --- a/bullet/README.md +++ b/bullet/README.md @@ -55,7 +55,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.bullet samples - 1.5.10 + 1.5.11-SNAPSHOT SimpleBox @@ -63,7 +63,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco bullet-platform - 3.25-1.5.10 + 3.25-1.5.11-SNAPSHOT diff --git a/bullet/platform/pom.xml b/bullet/platform/pom.xml index a9dd9b693de..0f7677068d1 100644 --- a/bullet/platform/pom.xml +++ b/bullet/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.10 + 1.5.11-SNAPSHOT ../../ diff --git a/bullet/pom.xml b/bullet/pom.xml index 675b152e82b..01c5d1ead45 100644 --- a/bullet/pom.xml +++ b/bullet/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.10 + 1.5.11-SNAPSHOT org.bytedeco diff --git a/bullet/samples/pom.xml b/bullet/samples/pom.xml index 500cf98aacd..578aa99a5a4 100644 --- a/bullet/samples/pom.xml +++ b/bullet/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.bullet samples - 1.5.10 + 1.5.11-SNAPSHOT SimpleBox 1.7 @@ -12,7 +12,7 @@ org.bytedeco bullet-platform - 3.25-1.5.10 + 3.25-1.5.11-SNAPSHOT