From 8d65be51d852ad3c68d0e90110ab7ddb8c7664c2 Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Thu, 1 Feb 2024 11:08:25 +0100 Subject: [PATCH] setup env action asks from where install qt --- .github/actions/0_setup/action.yml | 11 ++++++++--- .github/workflows/BuildMeshLab.yml | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/actions/0_setup/action.yml b/.github/actions/0_setup/action.yml index b4f9580a2..bb2594347 100644 --- a/.github/actions/0_setup/action.yml +++ b/.github/actions/0_setup/action.yml @@ -2,6 +2,11 @@ name: 'Setup Environment' description: 'Setup Environment' inputs: + use-jurpel-qt-action: + description: 'Use jurpel/qt-action' + required: false + type: boolean + default: true qt-version: description: 'Qt Version' required: false @@ -13,18 +18,18 @@ runs: - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt - if: ${{ matrix.os }} != 'macos-14' + if: ${{ inputs.use-jurpel-qt-action }} uses: jurplel/install-qt-action@v3 with: cache: true version: ${{ inputs.qt-version }} - name: Install dependencies - if: ${{ matrix.os }} != 'macos-14' + if: ${{ inputs.use-jurpel-qt-action }} shell: bash run: | bash scripts/${{ runner.os }}/0_setup_env.sh --dont_install_qt - name: Install dependencies - if: ${{ matrix.os }} == 'macos-14' + if: ${{ !inputs.use-jurpel-qt-action }} shell: bash run: | bash scripts/${{ runner.os }}/0_setup_env.sh \ No newline at end of file diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml index a8e9bde49..3880f4c80 100644 --- a/.github/workflows/BuildMeshLab.yml +++ b/.github/workflows/BuildMeshLab.yml @@ -24,6 +24,9 @@ jobs: submodules: recursive - name: Setup Environment uses: ./.github/actions/0_setup + with: + qt-version: ${{env.QT_VERSION}} + use-jurpel-qt-action: ${{ matrix.os }} != 'macos-14' - name: Setup env variables id: envs shell: bash