diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index ab8d9f5f8..508dbd689 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -9,15 +9,15 @@ inputs: runs: using: composite steps: - - run: ${GITHUB_ACTION_PATH}/install-dependencies.sh - shell: bash - env: - RUNNER_OS: ${{runner.os}} - INPUT_ARCH: ${{inputs.arch}} - INPUT_QT: ${{inputs.qt}} - if: runner.os == 'Windows' uses: jurplel/install-qt-action@v3 with: arch: ${{inputs.arch}} version: ${{matrix.qt == 6 && '6.4.2' || '5.15.2'}} modules: ${{matrix.qt == 6 && 'qtmultimedia' || ''}} + - run: ${GITHUB_ACTION_PATH}/install-dependencies.sh + shell: bash + env: + RUNNER_OS: ${{runner.os}} + INPUT_ARCH: ${{inputs.arch}} + INPUT_QT: ${{inputs.qt}} diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh index 3f894366f..2568758d1 100755 --- a/.github/actions/install-dependencies/install-dependencies.sh +++ b/.github/actions/install-dependencies/install-dependencies.sh @@ -51,12 +51,14 @@ setup_macos() { } setup_windows() { - pip install --ignore-requires-python translate-toolkit[rc] + pip install translate-toolkit[rc] curl -fsSLO https://okapiframework.org/binaries/main/1.45.0/okapi-apps_win32-x86_64_1.45.0.zip mkdir okapi "${WINDIR}\\System32\\tar" xfC okapi-apps_win32-x86_64_1.45.0.zip okapi dotnet tool install -g wix --version 4.0.4 wix extension add -g WixToolset.Util.wixext/4.0.4 WixToolset.Bal.wixext/4.0.4 + nuget install -x -OutputDirectory util/installer WixToolset.BootstrapperCore.Native -Version 4.0.4 + nuget install -x -OutputDirectory util/installer WixToolset.DUtil -Version 4.0.4 nuget install -x -OutputDirectory util/installer WixToolset.BalUtil -Version 4.0.4 }