Remove some Qt6 CI workflows (#2943)

* Remove some Qt6 CI workflows Removed: lottie tests mac/linux Qt5 unit test mac/linux Qt5 wasm Qt5 macos Qt5 build * Remove Macos QML test for Qt5 * Update wasm.yaml Remove wasm from ghPages * Update wasm.yaml Removed the download of wasm qt5 from the ghPages publishing.
mozilla-mobile · Mar 8, 2022 · b01489f · b01489f
1 parent 11a6ac6
commit b01489f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 56 deletions.
diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml
@@ -18,7 +18,6 @@ jobs:
     strategy:
       matrix:
         config:
-            - { name: "Qt5", pattern: x, folder: qt }
             - { name: "Qt6", pattern: qt6, folder: qt6 }
 
     steps:
@@ -190,7 +189,6 @@ jobs:
     strategy:
       matrix:
         config:
-            - { name: "Qt5", pattern: x, folder: qt }
             - { name: "Qt6", pattern: qt6, folder: qt6 }
 
     steps:

diff --git a/.github/workflows/test_lottie.yaml b/.github/workflows/test_lottie.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false # Don't cancel other jobs
       matrix:
-        version: ["5.15.2","6.2.1"]
+        version: ["6.2.1"]
     runs-on: ubuntu-20.04
     name: "Run Lottie tests on ${{matrix.version}}"
     steps:
@@ -39,7 +39,6 @@ jobs:
     strategy:
       matrix:
         config:
-            - { name: "Qt5", pattern: x, folder: qt }
             - { name: "Qt6", pattern: qt6, folder: qt6 }
 
     runs-on: macos-latest

diff --git a/.github/workflows/test_qml.yaml b/.github/workflows/test_qml.yaml
@@ -57,7 +57,6 @@ jobs:
     strategy:
       matrix:
         config:
-            - { name: "Qt5", pattern: x, folder: qt }
             - { name: "Qt6", pattern: qt6, folder: qt6 }
 
     runs-on: macos-latest

diff --git a/.github/workflows/test_unit.yaml b/.github/workflows/test_unit.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false # Don't cancel other jobs
       matrix:
-        version: ["5.15.2","6.2.1"]
+        version: ["6.2.1"]
     runs-on: ubuntu-20.04
     name: "Run Unit tests on ${{matrix.version}}"
     steps:
@@ -58,7 +58,6 @@ jobs:
     strategy:
       matrix:
         config:
-            - { name: "Qt5", pattern: x, folder: qt }
             - { name: "Qt6", pattern: qt6, folder: qt6 }
 
     runs-on: macos-latest

diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml
@@ -11,48 +11,6 @@ on:
       - 'releases/**'
 
 jobs:
-  wasm:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v2
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
-      - name: Install Qt
-        shell: bash
-        run: |
-          python3 -m pip install aqtinstall
-          python3 -m aqt install-qt -O /opt linux desktop 5.15.2 wasm_32 -m qtcharts
-
-      - name: Install python dependencies
-        shell: bash
-        run: |
-          pip install -r requirements.txt
-
-      - name: Setup emsdk
-        uses: mymindstorm/setup-emsdk@v7
-        with:
-          version: 1.39.8
-
-      - name: Compiling
-        shell: bash
-        run: |
-          export PATH=/opt/5.15.2/wasm_32/bin:$PATH
-          ./scripts/wasm/compile.sh
-
-      - name: Uploading
-        uses: actions/upload-artifact@v1
-        with:
-            name: WebAssembly Build Qt5
-            path: wasm
-
   wasmQt6:
     name: Wasm Qt6
     runs-on: ubuntu-20.04
@@ -128,17 +86,11 @@ jobs:
 
   ghPages:
     runs-on: ubuntu-20.04
-    needs: [wasm, wasmQt6, inspector]
+    needs: [wasmQt6, inspector]
     name: Publish Wasm on Github Pages
     env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Download a Build Artifact
-        uses: actions/[email protected]
-        with:
-          name: WebAssembly Build Qt5
-          # Destination path
-          path: _site/qt5
       - name: Download a Build Artifact
         uses: actions/[email protected]
         with: