Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): update xcode #508

Merged
merged 10 commits into from
Jul 9, 2024
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
54 changes: 27 additions & 27 deletions .github/workflows/build_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -325,14 +325,14 @@ 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@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Setup ${{ matrix.compiler }} compiler
Expand Down Expand Up @@ -366,34 +366,34 @@ 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@v3
uses: actions/checkout@v4
with:
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)
Expand All @@ -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)
Expand Down Expand Up @@ -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 }})
Expand All @@ -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 }})
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/build_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -80,32 +80,32 @@ 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@v3
uses: actions/checkout@v4
with:
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)
Expand All @@ -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)
Expand Down Expand Up @@ -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 }})
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/msvc-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_cpp_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ image:
- Visual Studio 2017

configuration:
- Debug
- Release

platform:
Expand Down
10 changes: 9 additions & 1 deletion tools/setup_osx_compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading