From 2a6a8ac8484248ee16e6cd68f142254a660e864f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Trojnara?= Date: Fri, 25 Oct 2024 18:55:37 +0200 Subject: [PATCH 01/12] Switch to venv on macOS --- .github/workflows/ci.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14cb9f3..6de1e1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,10 +114,12 @@ jobs: sudo apt-get remove needrestart || echo Ignored sudo apt-get install -y libssl-dev zlib1g-dev python3-cryptography - - name: Install brew dependencies (macOS) + - name: Set up Python virtual environment (macOS) if: runner.os == 'macOS' run: | - brew install python@3.8 + python -m venv venv + echo "VIRTUAL_ENV=${{github.workspace}}/venv" >> $GITHUB_ENV + echo "${{github.workspace}}/venv/bin" >> $GITHUB_PATH - name: Install Xcode (macOS) if: runner.os == 'macOS' @@ -134,9 +136,8 @@ jobs: - name: Install python3 cryptography module (macOS) if: runner.os == 'macOS' run: | - python3.8 -m ensurepip - python3.8 -m pip install --upgrade pip - python3.8 -m pip install cryptography + pip install --upgrade pip + pip install cryptography - name: Find the latest version of Python (Windows) if: runner.os == 'Windows' @@ -181,9 +182,9 @@ jobs: working-directory: ${{github.workspace}}/build if: runner.os == 'macOS' run: | - python3.8 --version - python3.8 -c "import sys; print(sys.executable)" - python3.8 -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" + python --version + python -c "import sys; print(sys.executable)" + python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - name: List files (Linux/macOS) if: runner.os != 'Windows' From c5c1dfa810ffa34e5bfa8c21fb43f0a042db7fcb Mon Sep 17 00:00:00 2001 From: olszomal Date: Mon, 4 Nov 2024 15:21:16 +0100 Subject: [PATCH 02/12] Configured macOS environment for arm64 architecture --- .github/workflows/ci.yml | 68 +++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6de1e1e..4bdc6a2 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 @@ -114,10 +114,17 @@ jobs: sudo apt-get remove needrestart || echo Ignored sudo apt-get install -y libssl-dev zlib1g-dev python3-cryptography + - name: Set up Python (macOS) + if: runner.os == 'macOS' + uses: actions/setup-python@v4 + with: + python-version: '3.13' + architecture: 'arm64' + - name: Set up Python virtual environment (macOS) if: runner.os == 'macOS' run: | - python -m venv venv + python -m venv --system-site-packages --copies venv echo "VIRTUAL_ENV=${{github.workspace}}/venv" >> $GITHUB_ENV echo "${{github.workspace}}/venv/bin" >> $GITHUB_PATH @@ -131,13 +138,24 @@ 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 + python -c "import sys; print(sys.executable)" + python --version + python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" + + - name: Install python3 cryptography module (Windows) + if: runner.os == 'Windows' + run: | + python.exe -m ensurepip + python.exe -m pip install --upgrade pip + python.exe -m pip install cryptography - name: Find the latest version of Python (Windows) if: runner.os == 'Windows' @@ -156,19 +174,25 @@ jobs: exit 1 } - - name: Install python3 cryptography module (Windows) - if: runner.os == 'Windows' + - name: Configure CMake (macOS) + if: runner.os == 'macOS' run: | - python.exe -m ensurepip - python.exe -m pip install --upgrade pip - python.exe -m pip install cryptography - - - name: Configure CMake + source venv/bin/activate + cmake \ + -G "${{ matrix.generator }}" \ + -S "${{ github.workspace }}" \ + -B "${{ github.workspace }}/build" \ + -DCMAKE_OSX_ARCHITECTURES=arm64 \ + -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" \ + -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" \ + -DPython3_EXECUTABLE="${{ github.workspace }}/venv/bin/python" + + - name: Configure CMake (non-macOS) + if: runner.os != 'macOS' run: cmake -G "${{matrix.generator}}" -S ${{github.workspace}} -B ${{github.workspace}}/build - -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/dist -DVCPKG_TARGET_TRIPLET=${{matrix.triplet}} @@ -178,14 +202,6 @@ jobs: --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - name: Show python version (macOS) - working-directory: ${{github.workspace}}/build - if: runner.os == 'macOS' - run: | - python --version - python -c "import sys; print(sys.executable)" - python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - - name: List files (Linux/macOS) if: runner.os != 'Windows' run: find .. -ls @@ -194,7 +210,15 @@ 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) + if: runner.os != 'macOS' working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}} From 9389d66134c188615fa3af5119d85767800f1383 Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 08:46:55 +0100 Subject: [PATCH 03/12] Check Python and cryptography version in Windows CI workflow --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bdc6a2..b55fc71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,6 +156,9 @@ jobs: python.exe -m ensurepip python.exe -m pip install --upgrade pip python.exe -m pip install cryptography + python.exe -c "import sys; print(sys.executable)" + python.exe --version + python.exe -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - name: Find the latest version of Python (Windows) if: runner.os == 'Windows' From 91eb1e98c3ea8af77b3b1141886894e62bbbd444 Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 10:09:31 +0100 Subject: [PATCH 04/12] Switch to venv on Windows --- .github/workflows/ci.yml | 54 ++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b55fc71..576a058 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,9 +150,18 @@ jobs: python --version python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" + - name: Set up Python virtual environment (Windows) + if: runner.os == 'Windows' + run: | + python.exe -m venv --system-site-packages --copies venv + echo "VIRTUAL_ENV=${{github.workspace}}\venv" >> $GITHUB_ENV + echo "${{github.workspace}}\venv\Scripts" >> $GITHUB_PATH + + - name: Install python3 cryptography module (Windows) if: runner.os == 'Windows' run: | + .\venv\Scripts\Activate.ps1 python.exe -m ensurepip python.exe -m pip install --upgrade pip python.exe -m pip install cryptography @@ -160,23 +169,6 @@ jobs: python.exe --version python.exe -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - - name: Find the latest version of Python (Windows) - if: runner.os == 'Windows' - run: | - $pythonVersions = Get-ChildItem -Path "C:/hostedtoolcache/windows/Python/" -Directory | Where-Object { $_.Name -match '\d+\.\d+\.\d+' } | Sort-Object { [Version]($_.Name) } -Descending - if ($pythonVersions.Count -gt 0) { - $latestPythonVersion = $pythonVersions[0].Name - $pythonPath = "C:/hostedtoolcache/windows/Python/$latestPythonVersion/x64" - Write-Output "Latest Python version found: $latestPythonVersion" - Write-Output "Python directory path: $pythonPath" - $env:Path = "$pythonPath;" + $env:Path - Write-Output "Updated PATH environment variable:" - Write-Output $env:Path - } else { - Write-Error "No Python versions found in C:/hostedtoolcache/windows/Python/" - exit 1 - } - - name: Configure CMake (macOS) if: runner.os == 'macOS' run: | @@ -190,8 +182,21 @@ jobs: -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" \ -DPython3_EXECUTABLE="${{ github.workspace }}/venv/bin/python" - - name: Configure CMake (non-macOS) - if: runner.os != 'macOS' + - name: Configure CMake (Windows) + if: runner.os == 'Windows' + run: | + .\venv\Scripts\Activate.ps1 + cmake ` + -G "${{ matrix.generator }}" ` + -S "${{ github.workspace }}" ` + -B "${{ github.workspace }}/build" ` + -DCMAKE_OSX_ARCHITECTURES=arm64 ` + -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" ` + -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" ` + -DPython3_EXECUTABLE="${{ github.workspace }}\venv\Scripts\python.exe" + + - name: Configure CMake (Linux) + if: runner.os == 'Linux' run: cmake -G "${{matrix.generator}}" -S ${{github.workspace}} @@ -220,8 +225,15 @@ jobs: source ../venv/bin/activate ctest -C ${{env.BUILD_TYPE}} - - name: Test (non-macOS) - if: runner.os != 'macOS' + - name: Test (Windows) + if: runner.os == 'Windows' + working-directory: ${{github.workspace}}/build + run: | + ..\venv\Scripts\Activate.ps1 + ctest -C ${{env.BUILD_TYPE}} + + - name: Test (Linux) + if: runner.os == 'Linux' working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}} From b4e9cc6f5a76f736ec2f46e58cc6db685b868453 Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 10:34:26 +0100 Subject: [PATCH 05/12] Removed VIRTUAL_ENV --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 576a058..646a9fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,8 +125,6 @@ jobs: if: runner.os == 'macOS' run: | python -m venv --system-site-packages --copies venv - echo "VIRTUAL_ENV=${{github.workspace}}/venv" >> $GITHUB_ENV - echo "${{github.workspace}}/venv/bin" >> $GITHUB_PATH - name: Install Xcode (macOS) if: runner.os == 'macOS' @@ -154,9 +152,6 @@ jobs: if: runner.os == 'Windows' run: | python.exe -m venv --system-site-packages --copies venv - echo "VIRTUAL_ENV=${{github.workspace}}\venv" >> $GITHUB_ENV - echo "${{github.workspace}}\venv\Scripts" >> $GITHUB_PATH - - name: Install python3 cryptography module (Windows) if: runner.os == 'Windows' From 5068aa28539833fb648adc5af7f56c26832327cf Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 12:02:14 +0100 Subject: [PATCH 06/12] Switch to venv on Linux --- .github/workflows/ci.yml | 48 ++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 646a9fa..a89983b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,6 @@ jobs: run: | sudo apt-get update sudo apt-get remove needrestart || echo Ignored - sudo apt-get install -y libssl-dev zlib1g-dev python3-cryptography - name: Set up Python (macOS) if: runner.os == 'macOS' @@ -121,11 +120,16 @@ jobs: python-version: '3.13' architecture: 'arm64' - - name: Set up Python virtual environment (macOS) - if: runner.os == 'macOS' + - name: Set up Python virtual environment (Linux/macOS) + if: runner.os != 'Windows' run: | python -m venv --system-site-packages --copies venv + - name: Set up Python virtual environment (Windows) + if: runner.os == 'Windows' + run: | + python.exe -m venv --system-site-packages --copies venv + - name: Install Xcode (macOS) if: runner.os == 'macOS' uses: maxim-lobanov/setup-xcode@v1 @@ -138,6 +142,16 @@ jobs: with: cmake-version: '3.20.0' + - name: Install python3 cryptography module (Linux) + if: runner.os == 'Linux' + run: | + source venv/bin/activate + python -m pip install --upgrade pip + python -m pip install --no-binary :all: cryptography + python -c "import sys; print(sys.executable)" + python --version + python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" + - name: Install python3 cryptography module (macOS) if: runner.os == 'macOS' run: | @@ -148,11 +162,6 @@ jobs: python --version python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - - name: Set up Python virtual environment (Windows) - if: runner.os == 'Windows' - run: | - python.exe -m venv --system-site-packages --copies venv - - name: Install python3 cryptography module (Windows) if: runner.os == 'Windows' run: | @@ -164,8 +173,8 @@ jobs: python.exe --version python.exe -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - - name: Configure CMake (macOS) - if: runner.os == 'macOS' + - name: Configure CMake (Linux/macOS) + if: runner.os != 'Windows' run: | source venv/bin/activate cmake \ @@ -190,16 +199,6 @@ jobs: -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" ` -DPython3_EXECUTABLE="${{ github.workspace }}\venv\Scripts\python.exe" - - name: Configure CMake (Linux) - if: runner.os == 'Linux' - run: cmake - -G "${{matrix.generator}}" - -S ${{github.workspace}} - -B ${{github.workspace}}/build - -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/dist - -DVCPKG_TARGET_TRIPLET=${{matrix.triplet}} - - name: Build run: cmake --build ${{github.workspace}}/build @@ -213,8 +212,8 @@ jobs: if: runner.os == 'Windows' run: Get-ChildItem -Recurse -Name .. - - name: Test (macOS) - if: runner.os == 'macOS' + - name: Test (Linux/macOS) + if: runner.os != 'Windows' working-directory: ${{github.workspace}}/build run: | source ../venv/bin/activate @@ -227,11 +226,6 @@ jobs: ..\venv\Scripts\Activate.ps1 ctest -C ${{env.BUILD_TYPE}} - - name: Test (Linux) - if: runner.os == 'Linux' - working-directory: ${{github.workspace}}/build - run: ctest -C ${{env.BUILD_TYPE}} - - name: Upload the errors uses: actions/upload-artifact@v4 if: failure() From 770f1990406c1784c026246e2db27cbac3f26cfa Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 12:11:31 +0100 Subject: [PATCH 07/12] Retain needrestart package in Linux dependency installation --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a89983b..369d4da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,12 +107,6 @@ jobs: if: matrix.compiler == 'mingw' run: echo "D:/a/_temp/msys64/mingw64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Install apt dependencies (Linux) - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt-get remove needrestart || echo Ignored - - name: Set up Python (macOS) if: runner.os == 'macOS' uses: actions/setup-python@v4 From 231c16c88d1d424ff93806006b62e3a3bcafecb5 Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 13:42:39 +0100 Subject: [PATCH 08/12] Fixed pip install --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 369d4da..81a3087 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,7 +141,7 @@ jobs: run: | source venv/bin/activate python -m pip install --upgrade pip - python -m pip install --no-binary :all: cryptography + python -m pip install --upgrade cryptography python -c "import sys; print(sys.executable)" python --version python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" @@ -151,7 +151,7 @@ jobs: run: | source venv/bin/activate python -m pip install --upgrade pip - ARCHFLAGS="-arch arm64" python -m pip install --no-binary :all: cryptography + ARCHFLAGS="-arch arm64" python -m pip install --upgrade cryptography python -c "import sys; print(sys.executable)" python --version python -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" From c9764fd040d5c63dad809b102ad8fa34941916e9 Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 13:50:45 +0100 Subject: [PATCH 09/12] Remove Python3_EXECUTABLE --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81a3087..4b1d7b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -177,8 +177,7 @@ jobs: -B "${{ github.workspace }}/build" \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" \ - -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" \ - -DPython3_EXECUTABLE="${{ github.workspace }}/venv/bin/python" + -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" - name: Configure CMake (Windows) if: runner.os == 'Windows' @@ -188,10 +187,8 @@ jobs: -G "${{ matrix.generator }}" ` -S "${{ github.workspace }}" ` -B "${{ github.workspace }}/build" ` - -DCMAKE_OSX_ARCHITECTURES=arm64 ` -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" ` - -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" ` - -DPython3_EXECUTABLE="${{ github.workspace }}\venv\Scripts\python.exe" + -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" - name: Build run: cmake From 9cadb84eb39bffa39f688912cef32c9ea2683bc8 Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 14:25:47 +0100 Subject: [PATCH 10/12] Remove specific CMake version setup for macOS --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b1d7b3..9a25258 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,8 +133,6 @@ jobs: - name: Setup the oldest supported version of cmake (macOS) if: runner.os == 'macOS' uses: jwlawson/actions-setup-cmake@v2.0 - with: - cmake-version: '3.20.0' - name: Install python3 cryptography module (Linux) if: runner.os == 'Linux' From f538f4c58869790c2b7fa446480534612d07ca82 Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 14:39:50 +0100 Subject: [PATCH 11/12] Disable environment updates for Python setup --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a25258..4b7ca8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,6 +112,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.13' + update-environment: false architecture: 'arm64' - name: Set up Python virtual environment (Linux/macOS) From 8e8f64347bf566fe5c6730d7208261eaa4565b2b Mon Sep 17 00:00:00 2001 From: olszomal Date: Tue, 5 Nov 2024 14:49:52 +0100 Subject: [PATCH 12/12] Style updates --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b7ca8d..28aaab5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,27 +167,27 @@ jobs: python.exe -c "import cryptography; print(f'Python3 cryptography version {cryptography.__version__}')" - name: Configure CMake (Linux/macOS) - if: runner.os != 'Windows' + if: runner.os != 'Windows' run: | source venv/bin/activate cmake \ - -G "${{ matrix.generator }}" \ - -S "${{ github.workspace }}" \ - -B "${{ github.workspace }}/build" \ + -G "${{matrix.generator}}" \ + -S "${{github.workspace}}" \ + -B "${{github.workspace}}/build" \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ - -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" \ - -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" + -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" \ + -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/dist" - name: Configure CMake (Windows) if: runner.os == 'Windows' run: | .\venv\Scripts\Activate.ps1 cmake ` - -G "${{ matrix.generator }}" ` - -S "${{ github.workspace }}" ` - -B "${{ github.workspace }}/build" ` - -DCMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" ` - -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" + -G "${{matrix.generator}}" ` + -S "${{github.workspace}}" ` + -B "${{github.workspace}}/build" ` + -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" ` + -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/dist" - name: Build run: cmake @@ -205,14 +205,14 @@ jobs: - name: Test (Linux/macOS) if: runner.os != 'Windows' working-directory: ${{github.workspace}}/build - run: | + run: | source ../venv/bin/activate ctest -C ${{env.BUILD_TYPE}} - name: Test (Windows) if: runner.os == 'Windows' working-directory: ${{github.workspace}}/build - run: | + run: | ..\venv\Scripts\Activate.ps1 ctest -C ${{env.BUILD_TYPE}}