Skip to content

Commit dccf72c

Browse files
authored
chore: migrate from macos-13 to macos-14 (#98)
1 parent 606350a commit dccf72c

4 files changed

Lines changed: 21 additions & 13 deletions

File tree

.github/workflows/build_and_test_mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
Build_and_Run_GTest:
1414
name: Build and Run GoogleTest
15-
runs-on: macos-13
15+
runs-on: macos-14-large
1616
defaults:
1717
run:
1818
shell: bash -l {0}
@@ -46,7 +46,7 @@ jobs:
4646

4747
Build_and_Run_PyTest:
4848
name: Build and Run PyTest
49-
runs-on: macos-13
49+
runs-on: macos-14-large
5050
defaults:
5151
run:
5252
shell: bash -l {0}

.github/workflows/build_wheels.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
MACOSX_DEPLOYMENT_TARGET: "10.15"
1313
strategy:
1414
matrix:
15-
os: [ubuntu-22.04, macos-13, windows-latest, ubuntu-22.04-arm]
15+
os: [ubuntu-22.04, macos-14-large, windows-latest, ubuntu-22.04-arm]
1616
cibw_archs: ["auto64"]
17-
cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"]
17+
cibw_build: ["cp310", "cp311", "cp312", "cp313"]
1818

1919
steps:
2020
- uses: actions/checkout@v3
@@ -71,9 +71,9 @@ jobs:
7171
MACOSX_DEPLOYMENT_TARGET: "11.0"
7272
strategy:
7373
matrix:
74-
os: [macos-13-xlarge]
74+
os: [macos-14-xlarge]
7575
cibw_archs: ["arm64"]
76-
cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"]
76+
cibw_build: ["cp310", "cp311", "cp312", "cp313"]
7777

7878
steps:
7979
- uses: actions/checkout@v3
@@ -101,7 +101,11 @@ jobs:
101101
CIBW_BEFORE_ALL_MACOS: bash ci-utils/install_prereq_linux.sh &&
102102
mkdir -p /tmp/filepattern_bld &&
103103
cp -r local_install /tmp/filepattern_bld
104-
CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64" ON_GITHUB="TRUE" FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install"
104+
CIBW_ENVIRONMENT_MACOS: >-
105+
MACOSX_DEPLOYMENT_TARGET=11.0
106+
REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64"
107+
ON_GITHUB="TRUE"
108+
FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install"
105109
CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
106110
CIBW_ARCHS: ${{ matrix.cibw_archs }}
107111
CIBW_TEST_REQUIRES: pytest pydantic

.github/workflows/publish_pypi.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
MACOSX_DEPLOYMENT_TARGET: "10.15"
1515
strategy:
1616
matrix:
17-
os: [ubuntu-22.04, macos-13, windows-latest, ubuntu-22.04-arm]
17+
os: [ubuntu-22.04, macos-14-large, windows-latest, ubuntu-22.04-arm]
1818
cibw_archs: ["auto64"]
19-
cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
19+
cibw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*"]
2020

2121
steps:
2222
- uses: actions/checkout@v3
@@ -77,9 +77,9 @@ jobs:
7777
MACOSX_DEPLOYMENT_TARGET: "11.0"
7878
strategy:
7979
matrix:
80-
os: [macos-13-xlarge]
80+
os: [macos-14-xlarge]
8181
cibw_archs: ["arm64"]
82-
cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
82+
cibw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*"]
8383

8484
steps:
8585
- uses: actions/checkout@v3
@@ -107,7 +107,11 @@ jobs:
107107
CIBW_BEFORE_ALL_MACOS: bash ci-utils/install_prereq_linux.sh &&
108108
mkdir -p /tmp/filepattern_bld &&
109109
cp -r local_install /tmp/filepattern_bld
110-
CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64" ON_GITHUB="TRUE" FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install"
110+
CIBW_ENVIRONMENT_MACOS: >-
111+
MACOSX_DEPLOYMENT_TARGET=11.0
112+
REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64"
113+
ON_GITHUB="TRUE"
114+
FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install"
111115
CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
112116
CIBW_ARCHS: ${{ matrix.cibw_archs }}
113117
CIBW_TEST_REQUIRES: pytest pydantic

tests/cpp/CMakeLists.txt.gtest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.2)
1+
cmake_minimum_required(VERSION 3.20)
22

33
project(googletest-download NONE)
44

0 commit comments

Comments
 (0)