Workaround for missing WASM linguist tools

mozilla-mobile · Mar 15, 2022 · eaebbb2 · eaebbb2
1 parent 4666266
commit eaebbb2
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml
@@ -14,6 +14,8 @@ jobs:
   wasmQt6:
     name: Wasm Qt6
     runs-on: ubuntu-20.04
+    env:
+      QTVERSION: 6.2.3
 
     steps:
       - name: Clone repository
@@ -31,15 +33,17 @@ jobs:
         run: |
           python3 -m pip install aqtinstall
           # 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
+          python3 -m aqt install-qt -O /opt linux desktop $QTVERSION
+          python3 -m aqt install-qt -O /opt linux desktop $QTVERSION 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.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
+          sed '/sse/,+5 d' /opt/$QTVERSION/wasm_32/mkspecs/features/wasm/wasm.prf > /tmp/wasm.prf
+          mv /tmp/wasm.prf /opt/$QTVERSION/wasm_32/mkspecs/features/wasm/wasm.prf
+          ln -s /opt/$QTVERSION/gcc_64/bin/lconvert /opt/$QTVERSION/wasm_32/bin/
+          ln -s /opt/$QTVERSION/gcc_64/bin/lupdate /opt/$QTVERSION/wasm_32/bin/
 
       - name: Install python dependencies
         shell: bash
@@ -52,7 +56,7 @@ jobs:
       - name: Compiling
         shell: bash
         run: |
-          export PATH=/opt/6.2.3/wasm_32/bin:/opt/6.2.3/gcc_64/bin:$PATH
+          export PATH=/opt/$QTVERSION/wasm_32/bin:/opt/$QTVERSION/gcc_64/bin:$PATH
           ./scripts/wasm/compile.sh
 
       - name: Uploading