diff --git a/.github/workflows/full_test.yml b/.github/workflows/full_test.yml index 2a98cc3..999a64e 100644 --- a/.github/workflows/full_test.yml +++ b/.github/workflows/full_test.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-22.04, windows-2022, macos-11] + os: [macos-12, macos-14] steps: - uses: actions/checkout@v4 @@ -28,6 +28,7 @@ jobs: # to supply options, put them in 'env', like: env: CIBW_BEFORE_ALL_MACOS: bash scripts/cibw_before_all_macos.sh + #CIBW_ENVIRONMENT: PATH=/usr/local/bin:$PATH CIBW_TEST_REQUIRES: pytest CIBW_TEST_COMMAND: pytest --pyargs qmeq diff --git a/pyproject.toml b/pyproject.toml index 7a48339..eb71eec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,10 +52,10 @@ build = [ ] skip = [ "*-win32", - "*-manylinux_i686", + "*-win_arm64", + "*i686", "*aarch64", "*ppc64le", "*s390x", - "*universal2", - "*arm64" + "*universal2" ] diff --git a/scripts/cibw_before_all_macos.sh b/scripts/cibw_before_all_macos.sh index 83e560f..81c461a 100644 --- a/scripts/cibw_before_all_macos.sh +++ b/scripts/cibw_before_all_macos.sh @@ -1,6 +1,29 @@ #!/bin/bash set -e -x -ln -sf /usr/local/bin/gcc-10 /usr/local/bin/gcc +export PATH=/usr/local/bin:$PATH +echo $PATH + +GCC12=/usr/local/bin/gcc-12 +if [ ! -f "${GCC12}" ]; then + GCC12=/opt/homebrew/bin/gcc-12 +fi +echo $GCC12 + +ln -sf $GCC12 /usr/local/bin/gcc gcc --version +# /usr/local/bin/gcc-12 --version + +ln -sf $GCC12 /usr/local/bin/clang + +clang --version + +whereis gcc +whereis clang +whereis gcc-12 + +ls -alF /usr/bin/gcc* +ls -alF /usr/bin/clang* +ls -alF /usr/local/bin/gcc* +ls -alF /usr/local/bin/clang*