diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6de1e1e..cc15609 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: generator: Unix Makefiles vcpkg_root: - id: macOS - triplet: x64-osx + triplet: arm64-osx compiler: clang os: macOS-latest generator: Unix Makefiles @@ -131,13 +131,14 @@ jobs: if: runner.os == 'macOS' uses: jwlawson/actions-setup-cmake@v2.0 with: - cmake-version: '3.17.0' + cmake-version: '3.20.0' - name: Install python3 cryptography module (macOS) if: runner.os == 'macOS' run: | - pip install --upgrade pip - pip install cryptography + source venv/bin/activate + python -m pip install --upgrade pip + ARCHFLAGS="-arch arm64" python -m pip install --no-binary :all: cryptography - name: Find the latest version of Python (Windows) if: runner.os == 'Windows' @@ -182,8 +183,9 @@ jobs: working-directory: ${{github.workspace}}/build if: runner.os == 'macOS' run: | - python --version + source venv/bin/activate python -c "import sys; print(sys.executable)" + python --version python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - name: List files (Linux/macOS) @@ -194,7 +196,14 @@ jobs: if: runner.os == 'Windows' run: Get-ChildItem -Recurse -Name .. - - name: Test + - name: Test (macOS) + if: runner.os == 'macOS' + working-directory: ${{github.workspace}}/build + run: | + source ../venv/bin/activate + ctest -C ${{env.BUILD_TYPE}} + + - name: Test (non-macOS) working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}}