Use install-qt instead of aqt install - fixes VPN-1360

mozilla-mobile · Feb 11, 2022 · 5683aeb · 5683aeb
1 parent dfd58ba
commit 5683aeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -128,6 +128,7 @@ jobs:
       matrix:
         config:
             - { name: "Impish", dist: impish }
+            - { name: "Jammy", dist: jammy }
 
     runs-on: ubuntu-latest
     env:

diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml
@@ -29,7 +29,7 @@ jobs:
         shell: bash
         run: |
           python3 -m pip install aqtinstall
-          python3 -m aqt install --outputdir /opt 5.15.2 linux desktop wasm_32 -m qtcharts
+          python3 -m aqt install-qt -O /opt linux desktop 5.15.2 wasm_32 -m qtcharts
 
       - name: Install python dependencies
         shell: bash
@@ -72,16 +72,16 @@ jobs:
         shell: bash
         run: |
           python3 -m pip install aqtinstall
-          # qt6.2.1 for wasm needs the desktop linux installation
-          python3 -m aqt install --outputdir /opt 6.2.1 linux desktop
-          python3 -m aqt install --outputdir /opt 6.2.1 linux desktop wasm_32 -m qtcharts qtwebsockets qt5compat
+          # qt6.2.3 for wasm needs the desktop linux installation
+          python3 -m aqt install-qt -O /opt linux desktop 6.2.3
+          python3 -m aqt install-qt -O /opt linux desktop 6.2.3 wasm_32 -m qtcharts qtwebsockets qt5compat
 
       - name: Patching Qt
         shell: bash
         run: |
           # see: https://wiki.qt.io/Qt_6.2_Known_Issues#WebAssembly
-          sed '/sse/,+5 d' /opt/6.2.1/wasm_32/mkspecs/features/wasm/wasm.prf > /tmp/wasm.prf
-          mv /tmp/wasm.prf /opt/6.2.1/wasm_32/mkspecs/features/wasm/wasm.prf
+          sed '/sse/,+5 d' /opt/6.2.3/wasm_32/mkspecs/features/wasm/wasm.prf > /tmp/wasm.prf
+          mv /tmp/wasm.prf /opt/6.2.3/wasm_32/mkspecs/features/wasm/wasm.prf
 
       - name: Install python dependencies
         shell: bash
@@ -94,7 +94,7 @@ jobs:
       - name: Compiling
         shell: bash
         run: |
-          export PATH=/opt/6.2.1/wasm_32/bin:/opt/6.2.1/gcc_64/bin:$PATH
+          export PATH=/opt/6.2.3/wasm_32/bin:/opt/6.2.3/gcc_64/bin:$PATH
           ./scripts/wasm_compile.sh
 
       - name: Uploading
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,6 +128,7 @@ jobs: @@
           matrix:
             config:
                 - { name: "Impish", dist: impish }
+                - { name: "Jammy", dist: jammy }
         runs-on: ubuntu-latest
         env:
@@ Expand Down @@