update aqt to use install-qt

aglowacki · Aug 28, 2023 · 625dbbc · 625dbbc
1 parent 2864d6f
commit 625dbbc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -37,10 +37,10 @@ jobs:
       run: |
         python -m pip install aqtinstall
         if [ "$RUNNER_OS" == "macOS" ]; then  
-          python -m aqt install --outputdir ${{github.workspace}}/Qt 6.5.2 mac desktop clang_64 -m qtcharts --archives qtbase
+          python -m aqt install-qt --outputdir ${{github.workspace}}/Qt 6.5.2 mac desktop clang_64 -m qtcharts --archives qtbase
         else
-          python -m aqt install --outputdir ${{github.workspace}}/Qt 6.5.2 linux desktop gcc_64 --archives qtbase icu qtimageformats 
-          python -m aqt install --outputdir ${{github.workspace}}/Qt 6.5.2 linux desktop gcc_64 -m qtcharts
+          python -m aqt install-qt --outputdir ${{github.workspace}}/Qt 6.5.2 linux desktop gcc_64 --archives qtbase icu qtimageformats 
+          python -m aqt install-qt --outputdir ${{github.workspace}}/Qt 6.5.2 linux desktop gcc_64 -m qtcharts
         fi
     - name: Gen vcpkg
       working-directory: ${{github.workspace}}/XRF-Maps/vcpkg

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -31,7 +31,7 @@ jobs:
       displayName: 'Install aqtinstall'
     - script: |
         cd $(Build.SourcesDirectory)
-        python -m aqt install --outputdir $(Build.BinariesDirectory)\\Qt 6.5.2 windows desktop win64_msvc2019_64 -m qtcharts --archives qtbase
+        python -m aqt install-qt --outputdir $(Build.BinariesDirectory)\\Qt 6.5.2 windows desktop win64_msvc2019_64 -m qtcharts --archives qtbase
       displayName: 'Install Qt 6.5.2'
     - script: $(System.DefaultWorkingDirectory)/XRF-Maps/vcpkg/bootstrap-vcpkg.bat
     - task: Cache@2