Skip to content

Commit

Permalink
Merge pull request #748 from neutronimaging/issue747_MacOS12_Bump
Browse files Browse the repository at this point in the history
Bump Intel-based Mac runners from MacOS 12 to MacOS 13 in CI
  • Loading branch information
anderskaestner authored Dec 5, 2024
2 parents 6f7a787 + 96d98d2 commit 54528b7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/Build-multi-OS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# Build on the following 4 configurations:
# 1. <Windows, Release, 2022 MSVC compiler toolchain>
# 2. <Ubuntu latest, i.e. version 22.04, Release, GCC 11 compiler toolchain>
# 3. <MacOS 12 with x86-64 arch, Release, Clang 14 compiler toolchain>
# 3. <MacOS 13 with x86-64 arch, Release, Clang 14 compiler toolchain>
# 4. <MacOS 14 with arm64 arch, Release, Clang 15 compiler toolchain
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the list.
matrix:
Expand All @@ -44,7 +44,7 @@ jobs:
gcc: 11
build_type: Release
build_root: build-imagingsuite/Release
- os: macos-12
- os: macos-13
c_compiler: clang
cpp_compiler: clang++
clang: 14
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
# Build on the following 4 configurations:
# 1. <Windows, Release, 2022 MSVC compiler toolchain>
# 2. <Ubuntu latest, i.e. version 22.04, Release, GCC 11 compiler toolchain>
# 3. <MacOS 11 with x86-64 arch, Release, Clang 13 compiler toolchain>
# 3. <MacOS 13 with x86-64 arch, Release, Clang 14 compiler toolchain>
# 4. <MacOS 14 with arm64 arch, Release, Clang 15 compiler toolchain
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the list.
matrix: # Qt requires py7zr==0.20.x which requires python 3.7^
python-version: ["3.7","3.8","3.9", "3.10", "3.11", "3.12"]
os: [windows-2022, ubuntu-latest, macos-12, macos-14]
os: [windows-2022, ubuntu-latest, macos-13, macos-14]
include:
- os: windows-2022
c_compiler: cl
Expand All @@ -47,7 +47,7 @@ jobs:
gcc: 11
build_type: Release
build_root: build-imagingsuite/Release
- os: macos-12
- os: macos-13
c_compiler: clang
cpp_compiler: clang++
clang: 14
Expand Down

0 comments on commit 54528b7

Please sign in to comment.