From 88417ff492a69416095f3b4b5e532e74152f3634 Mon Sep 17 00:00:00 2001 From: Souriya Trinh Date: Sat, 6 Jul 2024 13:36:26 +0200 Subject: [PATCH 1/3] Update macos-11 and macos-12 to macos-latest for Github runners. --- .github/workflows/ios.yml | 2 +- .github/workflows/macos-ustk.yml | 2 +- .github/workflows/macos.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index d91f0ed1b0..33a5c3f07d 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-11] + os: [macos-latest] steps: - name: Checkout repository diff --git a/.github/workflows/macos-ustk.yml b/.github/workflows/macos-ustk.yml index 2ae924f511..9f976fa651 100644 --- a/.github/workflows/macos-ustk.yml +++ b/.github/workflows/macos-ustk.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-latest] steps: - name: Checkout repository diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 73a4c7f14d..e820b0096e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, macos-13] + os: [macos-13, macos-latest] steps: - name: Checkout repository @@ -33,8 +33,8 @@ jobs: - name: Print OS information run: system_profiler SPSoftwareDataType - - name: Install dependencies on macos-12 - if: matrix.os == 'macos-12' + - name: Install dependencies on macos-latest + if: matrix.os == 'macos-latest' run: | brew install libpng libjpeg-turbo libdc1394 opencv pcl librealsense zbar pkg-config nlohmann-json From 7b92bd108ac082663235e453c58615fe30d33e1f Mon Sep 17 00:00:00 2001 From: Souriya Trinh Date: Sat, 6 Jul 2024 13:47:52 +0200 Subject: [PATCH 2/3] Fix warning: "The iOS deployment target 'IPHONEOS_DEPLOYMENT_TARGET' is set to 9.0, but the range of supported deployment target versions is 12.0 to 17.0.99. (in target 'visp_tt' from project 'VISP')". Fix error: "ERROR: Command '['xcodebuild', 'IPHONEOS_DEPLOYMENT_TARGET=12.0', 'ARCHS=armv7', '-sdk', 'iphoneos', '-configuration', 'Release', '-parallelizeTargets', '-jobs', '3', '-target', 'ALL_BUILD', 'build']' returned non-zero exit status 65.". --- .github/workflows/ios.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 33a5c3f07d..f991347bdf 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -40,4 +40,6 @@ jobs: run: | mkdir build cd build - python ../platforms/ios/build_framework.py ios + # cf: doc\tutorial\ios\tutorial-install-iOS.dox + python ../platforms/ios/build_framework.py ios --iphoneos_deployment_target 12.0 --iphoneos_archs arm64 \ + --build_only_specified_archs True From 4e138a5f74b86463a4d760b4a2527f3b670d4992 Mon Sep 17 00:00:00 2001 From: Souriya Trinh Date: Sat, 6 Jul 2024 14:30:12 +0200 Subject: [PATCH 3/3] Add "cancel-in-progress" option for Nix runner. --- .github/workflows/nix.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 08dac2e379..41b1ecae63 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -2,6 +2,12 @@ name: "Nix CI" on: [pull_request, push] +# https://stackoverflow.com/questions/66335225/how-to-cancel-previous-runs-in-the-pr-when-you-push-new-commitsupdate-the-curre#comment133398800_72408109 +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency +concurrency: + group: ${{ github.workflow }}-${{ github.ref || github.run_id }} + cancel-in-progress: true + jobs: tests: name: "Nix build on ${{ matrix.os }}"