From 378db088bf22deae7da51a033af4b77781905454 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Wed, 24 Apr 2024 20:49:46 +0200 Subject: [PATCH] Try pip with actions/setup-python@v2 and aerm64 --- .github/workflows/cmake.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index ac56c2a8..c65283e2 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -24,10 +24,10 @@ jobs: - os: macos generator: Unix Makefiles - openssl_root: /usr/local/opt/openssl@1.1 + openssl_root: /opt/homebrew/opt/openssl artifact: build/xca-*.dmg host: mac - runs: macos-latest + runs: macos-14-arm64 - os: windows generator: MinGW Makefiles @@ -51,8 +51,15 @@ jobs: runs-on: ${{matrix.runs}} steps: + - name: Install Python 3.10 + uses: actions/setup-python@v2 + with: + python-version: "3.10" + - name: Install Sphinx - run: pip3 install sphinx + run: | + python -m pip install --upgrade pip + pip install sphinx - name: Install Qt uses: jurplel/install-qt-action@v3 @@ -80,7 +87,7 @@ jobs: - name: Configure # No YAML Multiline mechanism (>, |, \, >-, >+2 whatever) works as expected # Give up. Live with the long line - run: cmake -B ${{github.workspace}}/build -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOPENSSL_ROOT_DIR=${{matrix.openssl_root}} --warn-uninitialized -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" + run: cmake -B ${{github.workspace}}/build -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOPENSSL_ROOT_DIR=${{matrix.openssl_root}} --warn-uninitialized -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" - name: Build run: cmake --build ${{github.workspace}}/build -j 5 -v