Skip to content

Commit

Permalink
Merge pull request #63 from paulsengroup/ci/fix
Browse files Browse the repository at this point in the history
Workaround macOS CI failure
  • Loading branch information
robomics authored Aug 8, 2024
2 parents 2ecc4c1 + 1b11ff6 commit 49bdf4b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ jobs:
key: conan-${{ steps.cache-key.outputs.conan-key }}
path: ${{ env.CONAN_HOME }}

- name: Override default compilers (macOS)
if: matrix.platform == 'macos-latest'
run: |
echo 'CC=clang' >> $GITHUB_ENV
echo 'CXX=clang++' >> $GITHUB_ENV
- name: Build and install
run: pip install --verbose '.[test]'

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,17 @@ jobs:
env:
CIBW_ARCHS_LINUX: "x86_64"
CIBW_ARCHS_WINDOWS: "AMD64"
CIBW_ENVIRONMENT: "PIP_VERBOSE=1"
CIBW_ENVIRONMENT_MACOS: "CC=clang CXX=clang++ MACOSX_DEPLOYMENT_TARGET=10.15"

- name: Build wheels
uses: pypa/cibuildwheel@v2.19
if: github.event_name != 'pull_request'
env:
CIBW_ARCHS_LINUX: "x86_64 aarch64"
CIBW_ARCHS_WINDOWS: "AMD64"
CIBW_ENVIRONMENT: "PIP_VERBOSE=1"
CIBW_ENVIRONMENT_MACOS: "CC=clang CXX=clang++ MACOSX_DEPLOYMENT_TARGET=10.15"

- name: Verify clean directory
run: git diff --exit-code
Expand Down
4 changes: 0 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ test-skip = ["*universal2", "pp*"]
before-build = [
"rm -rf '{project}/build'",
]
environment = { PIP_VERBOSE=1 }

[tool.cibuildwheel.macos]
environment = { MACOSX_DEPLOYMENT_TARGET=10.15 }

[tool.ruff]
extend-select = [
Expand Down

0 comments on commit 49bdf4b

Please sign in to comment.