Skip to content

Commit e596cc7

Browse files
committed
Move setup to workflow file instead
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
1 parent f470516 commit e596cc7

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

.github/workflows/build_steps.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ jobs:
5555
ARCTICDB_BUILD_DIR: ${{matrix.build_dir}}
5656
ARCTICDB_VCPKG_INSTALLED_DIR: ${{matrix.vcpkg_installed_dir}}
5757
ARCTICDB_VCPKG_PACKAGES_DIR: ${{matrix.vcpkg_packages_dir}}
58+
MACOSX_DEPLOYMENT_TARGET: "11.0"
59+
CMAKE_OSX_DEPLOYMENT_TARGET: "11.0"
60+
OPENSSL_ROOT_DIR: "/usr/local/opt/openssl@3"
5861
CIBW_ENVIRONMENT_PASS_LINUX: SCCACHE_GHA_VERSION ACTIONS_CACHE_URL ACTIONS_RUNTIME_TOKEN VCPKG_INSTALLATION_ROOT
5962
VCPKG_BINARY_SOURCES VCPKG_NUGET_USER VCPKG_NUGET_TOKEN VCPKG_MAN_NUGET_USER VCPKG_MAN_NUGET_TOKEN
6063
CMAKE_C_COMPILER_LAUNCHER CMAKE_CXX_COMPILER_LAUNCHER CMAKE_BUILD_PARALLEL_LEVEL ARCTIC_CMAKE_PRESET
@@ -92,6 +95,9 @@ jobs:
9295
run: |
9396
brew install sccache
9497
brew install bison # required by thrift pulled via vcpkg
98+
brew install openssl@3
99+
# Force universal build of OpenSSL
100+
brew reinstall --build-from-source openssl@3
95101
echo "SCCACHE_DIR=/tmp/sccache" >> $GITHUB_ENV
96102
mkdir -p /tmp/sccache
97103

pyproject.toml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,6 @@ before-build = "set"
2727

2828
[tool.cibuildwheel.macos]
2929
build = "cp*-macosx_*"
30-
before-all = """
31-
brew install openssl@3
32-
# Force universal build of OpenSSL
33-
brew reinstall --build-from-source openssl@3
34-
# Set deployment target for vcpkg
35-
export MACOSX_DEPLOYMENT_TARGET=11.0
36-
export CMAKE_OSX_DEPLOYMENT_TARGET=11.0
37-
"""
38-
before-build = "export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3"
39-
environment = {
40-
OPENSSL_ROOT_DIR = "/usr/local/opt/openssl@3",
41-
MACOSX_DEPLOYMENT_TARGET = "11.0",
42-
CMAKE_OSX_DEPLOYMENT_TARGET = "11.0"
43-
}
4430

4531
[tool.ruff]
4632
line-length = 120

0 commit comments

Comments
 (0)