diff --git a/taskcluster/kinds/toolchain/qt.yml b/taskcluster/kinds/toolchain/qt.yml index 0047e569fe..fdc7669aab 100644 --- a/taskcluster/kinds/toolchain/qt.yml +++ b/taskcluster/kinds/toolchain/qt.yml @@ -45,6 +45,8 @@ qt-windows-x86_64-6.6: qt-windows-aarch64-6.6: description: "Windows QT compile Task" fetches: + fetch: + - win-conda toolchain: - bundle-msvc - conda-windows-base-x86_64 diff --git a/taskcluster/scripts/toolchain/compile_qt_fancy.ps1 b/taskcluster/scripts/toolchain/compile_qt_fancy.ps1 index 47a95f0bd2..b442dab4ff 100644 --- a/taskcluster/scripts/toolchain/compile_qt_fancy.ps1 +++ b/taskcluster/scripts/toolchain/compile_qt_fancy.ps1 @@ -4,9 +4,10 @@ . "$PSScriptRoot/../common/helpers.ps1" +$ErrorActionPreference = "Stop" # Unpack Conda-Base Install-MiniConda -$CONDA_DIR = resolve-path "$FETCHES_PATH\conda-win-base" +$CONDA_DIR = resolve-path "$FETCHES_PATH\win-base" Start-Process -NoNewWindow "$CONDA_DIR\Scripts\conda-unpack.exe" -Wait conda activate $CONDA_DIR conda info