From c5c6d017198a1971a94a35bc808efdd7ae37c138 Mon Sep 17 00:00:00 2001 From: fcollot Date: Mon, 27 Nov 2023 15:35:07 +0100 Subject: [PATCH] Update cmake-multi-platform.yml --- .github/workflows/cmake-multi-platform.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index aee9049..bf34e7e 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -3,9 +3,9 @@ name: CMake on multiple platforms on: workflow_dispatch: push: - branches: [ "win" ] + branches: [ "main" ] pull_request: - branches: [ "win" ] + branches: [ "main" ] jobs: build: @@ -44,8 +44,11 @@ jobs: id: strings shell: bash run: | - echo "build-output-dir=build" >> "$GITHUB_OUTPUT" - echo "python-output-subdir=${{ matrix.build_type }}/$([[ "$OSTYPE" == "msys" ]] && echo "python310" || echo "lib/python3.10")" >> "$GITHUB_OUTPUT" + path-delimiter'=${{ runner.os == 'Windows' && '\' || '/'}}' + build-output-dir='${{ github.workspace }}$(path-delimiter)build' + echo "path-delimiter=$path-delimiter" >> "$GITHUB_OUTPUT'" + echo "build-output-dir=$build-output-dir" >> "$GITHUB_OUTPUT'" + echo "python-output-dir=$build-output-dir$path-delimiter${{ matrix.build_type }}$path-delimiter${{ runner.os == 'Windows' && echo "python310" || echo "lib/python3.10" }}" >> "$GITHUB_OUTPUT" - name: Install Qt uses: jurplel/install-qt-action@v3 @@ -60,8 +63,8 @@ jobs: uses: actions/cache@v3 with: path: | - '${{ steps.strings.outputs.build-output-dir }}/python' - '${{ steps.strings.outputs.build-output-dir }}/${{ steps.strings.outputs.python-output-subdir }}' + '${{ steps.strings.outputs.build-output-dir }}${{ steps.strings.outputs.path-delimiter }}python' + '${{ steps.strings.outputs.python-output-dir }}' key: ${{ runner.OS }}-python-cache-${{ hashFiles('python/*') }} restore-keys: | ${{ runner.OS }}-python-cache-