From 93e02621cfc688bffa00e797c8e44f781615f351 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:10:11 -0400 Subject: [PATCH 01/10] chore(ci): update xcode version support --- tools/setup_osx_compiler.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/setup_osx_compiler.sh b/tools/setup_osx_compiler.sh index 53aabaaa..0c4cef9e 100755 --- a/tools/setup_osx_compiler.sh +++ b/tools/setup_osx_compiler.sh @@ -4,6 +4,10 @@ COMPILER=$1 # See Github hosted runners: +# macos-14: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md +# xcode 14.3.1, 15.0.1, 15.1, 15.2, 15.3, 15.4, 16.0 +# macos-13: https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md +# xcode 14.1, 14.2, 14.3.1, 15.0.1, 15.1, 15.2 # macos-12: https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md # xcode 13.1, 12.2.1, 13.3.1, 13.4.1, 14.1, 14.2 # maxos-11: https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md @@ -22,7 +26,11 @@ elif [[ $COMPILER == xcode12 ]]; then elif [[ $COMPILER == xcode13 ]]; then XCODE_PATH="/Applications/Xcode_13.2.1.app" elif [[ $COMPILER == xcode14 ]]; then - XCODE_PATH="/Applications/Xcode_14.2.app" + XCODE_PATH="/Applications/Xcode_14.3.1.app" +elif [[ $COMPILER == xcode15 ]]; then + XCODE_PATH="/Applications/Xcode_15.2.app" +elif [[ $COMPILER == xcode16 ]]; then + XCODE_PATH="/Applications/Xcode_16.0.app" fi # Select our XCode version From 2f7e179c76dabe21f68e36e89ec83884ac408a84 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:10:52 -0400 Subject: [PATCH 02/10] chore(ci): update checkout action to v4 --- .github/workflows/test_cpp_versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_cpp_versions.yml b/.github/workflows/test_cpp_versions.yml index 20b7dc65..54cdb63d 100644 --- a/.github/workflows/test_cpp_versions.yml +++ b/.github/workflows/test_cpp_versions.yml @@ -16,7 +16,7 @@ jobs: cpp_version: [14, 17, 20] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (release-x86) @@ -55,7 +55,7 @@ jobs: cpp_version: [14, 17, 20] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (release-x86) From 933e51a28ae451cebb3be549f0628036c7b5b928 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:11:04 -0400 Subject: [PATCH 03/10] chore(ci): update checkout action to v4 --- .github/workflows/sonarcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 68d4ebea..f2729c6a 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -33,7 +33,7 @@ jobs: if: ${{ needs.condition-check.outputs.ok == 'true' }} steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Build with wrapper From 4440cbd005b7daaa0e1ce33e003e749031aade15 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:11:17 -0400 Subject: [PATCH 04/10] chore(ci): update checkout action to v4 --- .github/workflows/msvc-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msvc-analysis.yml b/.github/workflows/msvc-analysis.yml index ce849d8c..34ef2a64 100644 --- a/.github/workflows/msvc-analysis.yml +++ b/.github/workflows/msvc-analysis.yml @@ -26,7 +26,7 @@ jobs: runs-on: windows-2022 steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Generate solution (release-x64) From e5e13f4d29e8c958794bbcc34f0e5ff03279c6ce Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:11:43 -0400 Subject: [PATCH 05/10] chore(ci): update checkout action to v4 --- .github/workflows/build_push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 61106465..a5bf8af9 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -16,7 +16,7 @@ jobs: compiler: [gcc13, clang15] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (release-x86) @@ -87,7 +87,7 @@ jobs: compiler: [xcode14] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler @@ -119,7 +119,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Build (release) @@ -152,7 +152,7 @@ jobs: simd: -avx steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (${{ matrix.build_config }}-${{ matrix.cpu }}) From 5c57a4a3c8ff4a93308343d849d5c2d1d235dab0 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:12:27 -0400 Subject: [PATCH 06/10] chore(ci): update checkout action to v4 --- .github/workflows/build_pull_request.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index c984225c..9ecd9456 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -16,7 +16,7 @@ jobs: compiler: [clang4] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x86) @@ -95,7 +95,7 @@ jobs: compiler: [gcc5, gcc6, gcc7, gcc8, clang5, clang6, clang7, clang8, clang9, clang10] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x86) @@ -174,7 +174,7 @@ jobs: compiler: [gcc9, gcc10, gcc11, clang11, clang12, clang13, clang14] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x86) @@ -253,7 +253,7 @@ jobs: compiler: [gcc12, gcc13, clang15] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x86) @@ -332,7 +332,7 @@ jobs: compiler: [xcode12, xcode13] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler @@ -373,7 +373,7 @@ jobs: compiler: [xcode14] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler @@ -411,7 +411,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Build (debug) @@ -451,7 +451,7 @@ jobs: simd: -avx steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (${{ matrix.build_config }}-${{ matrix.cpu }}) @@ -476,7 +476,7 @@ jobs: simd: -avx steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (${{ matrix.build_config }}-${{ matrix.cpu }}) From a858ee68b281e5d7039bbee59844250189e4bd2c Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:12:40 -0400 Subject: [PATCH 07/10] chore(ci): update checkout action to v4 --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e0e210a0..584e9ae7 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (release-x64) From b0f5b497577b1f493065d4d53235d1f28a8af46d Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:14:26 -0400 Subject: [PATCH 08/10] chore(ci): update to xcode 15 with commit push --- .github/workflows/build_push.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index a5bf8af9..a36ba80b 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -80,11 +80,11 @@ jobs: with: args: 'python3 make.py -ci -compiler ${{ matrix.compiler }} -config Release -cpu x64 -avx -regression_test' - osx-12: - runs-on: macos-12 + osx-14: + runs-on: macos-14 strategy: matrix: - compiler: [xcode14] + compiler: [xcode15] steps: - name: Git checkout uses: actions/checkout@v4 @@ -92,20 +92,20 @@ jobs: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler run: ./tools/setup_osx_compiler.sh ${{ matrix.compiler }} - - name: Building (release-x64) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -build - - name: Running unit tests (release-x64) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -unit_test - - name: Running regression tests (release-x64) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -regression_test + - name: Building (release-arm64) + run: python3 make.py -ci -compiler osx -config Release -build + - name: Running unit tests (release-arm64) + run: python3 make.py -ci -compiler osx -config Release -unit_test + - name: Running regression tests (release-arm64) + run: python3 make.py -ci -compiler osx -config Release -regression_test - name: Clean run: python3 make.py -ci -clean_only - - name: Building (release-x64 nosimd) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -nosimd -build - - name: Running unit tests (release-x64 nosimd) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -nosimd -unit_test - - name: Running regression tests (release-x64 nosimd) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -nosimd -regression_test + - name: Building (release-arm64 nosimd) + run: python3 make.py -ci -compiler osx -config Release -nosimd -build + - name: Running unit tests (release-arm64 nosimd) + run: python3 make.py -ci -compiler osx -config Release -nosimd -unit_test + - name: Running regression tests (release-arm64 nosimd) + run: python3 make.py -ci -compiler osx -config Release -nosimd -regression_test - name: Clean run: python3 make.py -ci -clean_only - name: Building for iOS (release-arm64) From 36dfdda99e5fa80014d86f204eda5389b71a4970 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Mon, 8 Jul 2024 21:16:22 -0400 Subject: [PATCH 09/10] chore(ci): update xcode version for pull request push --- .github/workflows/build_pull_request.yml | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 9ecd9456..9402cb52 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -325,11 +325,11 @@ jobs: with: args: 'python3 make.py -ci -compiler ${{ matrix.compiler }} -config Release -cpu x64 -avx -unit_test' - osx-11: - runs-on: macos-11 + osx-12: + runs-on: macos-12 strategy: matrix: - compiler: [xcode12, xcode13] + compiler: [xcode13] steps: - name: Git checkout uses: actions/checkout@v4 @@ -366,11 +366,11 @@ jobs: - name: Building for iOS (release-arm64 nosimd) run: python3 make.py -ci -compiler ios -config Release -build -nosimd - osx-12: - runs-on: macos-12 + osx-14: + runs-on: macos-14 strategy: matrix: - compiler: [xcode14] + compiler: [xcode14, xcode15] steps: - name: Git checkout uses: actions/checkout@v4 @@ -378,22 +378,22 @@ jobs: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler run: ./tools/setup_osx_compiler.sh ${{ matrix.compiler }} - - name: Building (debug-x64) - run: python3 make.py -ci -compiler osx -config Debug -cpu x64 -build - - name: Running unit tests (debug-x64) - run: python3 make.py -ci -compiler osx -config Debug -cpu x64 -unit_test + - name: Building (debug-arm64) + run: python3 make.py -ci -compiler osx -config Debug -build + - name: Running unit tests (debug-arm64) + run: python3 make.py -ci -compiler osx -config Debug -unit_test - name: Clean run: python3 make.py -ci -clean_only - - name: Building (release-x64) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -build - - name: Running unit tests (release-x64) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -unit_test + - name: Building (release-arm64) + run: python3 make.py -ci -compiler osx -config Release -build + - name: Running unit tests (release-arm64) + run: python3 make.py -ci -compiler osx -config Release -unit_test - name: Clean run: python3 make.py -ci -clean_only - - name: Building (release-x64 nosimd) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -nosimd -build - - name: Running unit tests (release-x64 nosimd) - run: python3 make.py -ci -compiler osx -config Release -cpu x64 -nosimd -unit_test + - name: Building (release-arm64 nosimd) + run: python3 make.py -ci -compiler osx -config Release -nosimd -build + - name: Running unit tests (release-arm64 nosimd) + run: python3 make.py -ci -compiler osx -config Release -nosimd -unit_test - name: Clean run: python3 make.py -ci -clean_only - name: Building for iOS (debug-arm64) From 8a9ff9b4cd0b47ce18936bf28739e6dda959023c Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Tue, 9 Jul 2024 13:17:37 -0400 Subject: [PATCH 10/10] chore(ci): don't run unit tests in debug config with appveyor --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fdf16fdc..fdc10708 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,6 @@ image: - Visual Studio 2017 configuration: - - Debug - Release platform: