From d1c4bcf0112ccd04a0ef03326902b076e30195dd Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:11:13 -0400 Subject: [PATCH 1/9] chore(ci): update xcode version support --- tools/setup_osx_compiler.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/setup_osx_compiler.sh b/tools/setup_osx_compiler.sh index 53aabaa..18931f4 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 @@ -23,6 +27,10 @@ elif [[ $COMPILER == xcode13 ]]; then XCODE_PATH="/Applications/Xcode_13.2.1.app" elif [[ $COMPILER == xcode14 ]]; then XCODE_PATH="/Applications/Xcode_14.2.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 4d0026f811bfcbe1d840cc46edfd3db7198a5ebd Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:12:57 -0400 Subject: [PATCH 2/9] chore(ci): update to xcode 15 with commit push --- .github/workflows/build_push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 5437577..bfbd081 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -63,11 +63,11 @@ jobs: with: args: 'python3 make.py -ci -compiler ${{ matrix.compiler }} -config Release -cpu x64 -unit_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@v3 From 5fb697edc7503270d042dbc5c85ac1531c915391 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:15:37 -0400 Subject: [PATCH 3/9] chore(ci): update xcode version for pull request push --- .github/workflows/build_pull_request.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index b5ca0e8..2189e68 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -228,11 +228,11 @@ jobs: with: args: 'python3 make.py -ci -compiler ${{ matrix.compiler }} -config Release -cpu x64 -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@v3 @@ -259,11 +259,11 @@ jobs: - name: Building for iOS (release-arm64) run: python3 make.py -ci -compiler ios -config Release -build - 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@v3 From 5fa805b8f2d9d7e90a7d99696c8ffc27000bbdae Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:18:06 -0400 Subject: [PATCH 4/9] 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 6410712..31a3b60 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Build with wrapper From 45c2d5314a73de30a5b56560cfed00322877a72f Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:19:17 -0400 Subject: [PATCH 5/9] 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 bfbd081..83e2df2 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -15,7 +15,7 @@ jobs: compiler: [gcc13, clang18] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x86) @@ -70,7 +70,7 @@ jobs: compiler: [xcode15] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler @@ -98,7 +98,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug) @@ -126,7 +126,7 @@ jobs: runs-on: windows-2022 steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x64) From cd1ce2dccae17bf77a881dc2b9d8fc19f583f66f Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:22:10 -0400 Subject: [PATCH 6/9] 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 2189e68..c83ea35 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -15,7 +15,7 @@ jobs: compiler: [clang4] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x86) @@ -70,7 +70,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) @@ -125,7 +125,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) @@ -180,7 +180,7 @@ jobs: compiler: [gcc12, gcc13, clang15, clang16, clang17, clang18] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x86) @@ -235,7 +235,7 @@ jobs: compiler: [xcode13] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler @@ -266,7 +266,7 @@ jobs: compiler: [xcode14, xcode15] steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Setup ${{ matrix.compiler }} compiler @@ -294,7 +294,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug) @@ -322,7 +322,7 @@ jobs: runs-on: windows-2019 steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x64) @@ -360,7 +360,7 @@ jobs: runs-on: windows-2022 steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Building (debug-x64) From 8409e652dc37a49fba4efdbda62214b2d9610d61 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:25:11 -0400 Subject: [PATCH 7/9] chore(ci): switch commit push xcode to arm64 --- .github/workflows/build_push.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 83e2df2..95ed0e6 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -75,16 +75,16 @@ 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 -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 -clean_only - name: Building for iOS (debug-arm64) From 347269d0cc086ec63589508faa805b8fedf82228 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 12:26:32 -0400 Subject: [PATCH 8/9] chore(ci): update pull request push xcode to arm64 --- .github/workflows/build_pull_request.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index c83ea35..e04ffd9 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -271,16 +271,16 @@ 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 -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 -clean_only - name: Building for iOS (debug-arm64) From 739a88db0a43decb327aec07fd32685b02f7b453 Mon Sep 17 00:00:00 2001 From: Nicholas Frechette Date: Sat, 6 Jul 2024 13:50:56 -0400 Subject: [PATCH 9/9] chore(ci): update xcode 14 version --- tools/setup_osx_compiler.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup_osx_compiler.sh b/tools/setup_osx_compiler.sh index 18931f4..0c4cef9 100755 --- a/tools/setup_osx_compiler.sh +++ b/tools/setup_osx_compiler.sh @@ -26,7 +26,7 @@ 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