Merge remote-tracking branch 'origin/main' into basti/prototype/sadCmake

mozilla-mobile · Oct 31, 2022 · b3891eb · b3891eb
2 parents 5c2f285 + 88dbef3
commit b3891eb
Show file tree

Hide file tree

Showing 318 changed files with 3,919 additions and 3,060 deletions.
diff --git a/.github/workflows/functional_tests.yaml b/.github/workflows/functional_tests.yaml
@@ -22,7 +22,7 @@ jobs:
       matrix: ${{ steps.testGen.outputs.tests }}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Checkout submodules
         shell: bash
@@ -43,7 +43,7 @@ jobs:
 
           # Download the build and runtime package dependencies.
           sudo apt-get -o "Dir::Cache::archives=$(pwd)/build/archive" install -y \
-               $(./scripts/linux/getdeps.py -a linux/debian/control.qt6)
+               $(./scripts/linux/getdeps.py -a linux/debian/control)
           sudo chown -R $USER:$USER build/archive
 
       - name: Compile test client
@@ -88,7 +88,7 @@ jobs:
         test: ${{ fromJson(needs.build_test_app.outputs.matrix) }}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:
           name: test-client-${{ github.sha }}
@@ -127,12 +127,13 @@ jobs:
         continue-on-error: true # Ignore GRCOV parsing errors, see github.com/mozilla/grcov/issues/570
         timeout-minutes: 1 # Give GRCOV a short timeout in case it hangs after a panic
         run: |
+          chmod +x ./build/bin/grcov
           ./build/bin/grcov build/cmake/src/CMakeFiles/mozillavpn.dir \
               -s src -t lcov --branch --ignore-not-existing \
               -o ${{runner.temp}}/artifacts/functional_lcov.info
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         if: steps.generateGrcov.outcome == 'success'
         with:
           directory: .
@@ -142,7 +143,7 @@ jobs:
           verbose: true
 
       - name: Uploading artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: ${{matrix.test.name}} Logs

diff --git a/.github/workflows/gh_pages.yaml b/.github/workflows/gh_pages.yaml
@@ -24,16 +24,16 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
-      - uses: denoland/setup-deno@v1.0.0
+        uses: actions/checkout@v3
+      - uses: denoland/setup-deno@v1
         with:
           deno-version: v1.x # Run with latest stable Deno.
       - name: Generate Dynamic Files
         run: |
          cd tools/wasm_chrome
          deno run --allow-all generate_branch_file.ts -T ${{ secrets.GITHUB_TOKEN }}
       - name: Uploading
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
             name: Wasm-Chrome
             path: tools/wasm_chrome
@@ -43,9 +43,9 @@ jobs:
       runs-on: ubuntu-20.04
       steps:
         - name: Clone repository
-          uses: actions/checkout@v2
+          uses: actions/checkout@v3
         - name: Uploading
-          uses: actions/upload-artifact@v1
+          uses: actions/upload-artifact@v3
           with:
               name: Logviewer
               path: tools/logviewer
@@ -55,11 +55,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '16'
 
       - name: Building
         shell: bash
@@ -69,7 +69,7 @@ jobs:
           npm run build
 
       - name: Uploading
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
             name: Inspector Build
             path: tools/inspector/dist
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Checkout submodules
         shell: bash
@@ -112,11 +112,11 @@ jobs:
           ADDON_PRIVATE_KEY: ${{ secrets.ADDON_PRIVATE_KEY }}
         run: |
           echo -n "$ADDON_PRIVATE_KEY" > addon_private_key.pem
-          openssl dgst -sha256 -sign addon_private_key.pem -out addons/generated/addons/manifest.json.sign addons/generated/addons/manifest.json
+          openssl dgst -sha256 -sign addon_private_key.pem -out addons/generated/addons/manifest.json.sig addons/generated/addons/manifest.json
           rm addon_private_key.pem
 
       - name: Uploading
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
             name: Addons
             path: addons/generated/addons
@@ -129,25 +129,25 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Download Wasm-chrome
-        uses: actions/download-artifact@v2.0.8
+        uses: actions/download-artifact@v3
         with:
           name: Wasm-Chrome
           # Destination path
           path: _site
 
       - name: Download a Addons Artifact
-        uses: actions/download-artifact@v2.0.8
+        uses: actions/download-artifact@v3
         with:
           name: Addons
           path: _site/addons
       - name: Download the Logviewer Artifact
-        uses: actions/download-artifact@v2.0.8
+        uses: actions/download-artifact@v3
         with:
           name: Logviewer
           path: _site/logviewer
 
       - name: Download a Inspector Artifact
-        uses: actions/download-artifact@v2.0.8
+        uses: actions/download-artifact@v3
         with:
           name: Inspector Build
           path: _site/inspector
@@ -166,4 +166,4 @@ jobs:
       steps:
         - name: Deploy to GitHub Pages  
           id: deployment
-          uses: actions/deploy-pages@v1
+          uses: actions/deploy-pages@v1
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -21,7 +21,7 @@ jobs:
           aqt install-qt --outputdir /opt linux desktop $QTVERSION gcc_64 -m all
 
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Checkout submodules
         shell: bash
@@ -31,7 +31,7 @@ jobs:
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
       - name: Set up Python 3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: '3.8'
 

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install source dependencies
         shell: bash
@@ -34,7 +34,7 @@ jobs:
         run: ./scripts/linux/script.sh --source --gitref ${GITREF}
 
       - name: Upload source bundle
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
             name: Sources
             path: .tmp
@@ -48,14 +48,15 @@ jobs:
             - { name: "Bionic", dist: bionic, ppa: "ppa:okirby/qt6-backports" }
             - { name: "Focal", dist: focal, ppa: "ppa:okirby/qt6-backports" }
             - { name: "Jammy", dist: jammy, ppa: "" }
+            - { name: "Kinetic", dist: kinetic, ppa: "" }
 
     runs-on: ubuntu-latest
     env:
       BASETGZ: /var/cache/pbuilder/ubuntu-buildd-${{ matrix.config.dist }}.tgz
       QTPPA: ${{ matrix.config.ppa }}
     steps:
       - name: Download Source Package
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
             name: Sources
 
@@ -80,7 +81,7 @@ jobs:
           sudo pbuilder build --basetgz $BASETGZ --buildresult $(pwd)/packages mozillavpn_*-${{matrix.config.dist}}[0-9].dsc
 
       - name: Uploading
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
             name: ${{matrix.config.name}} Build
             path: packages
@@ -94,7 +95,7 @@ jobs:
 
     steps:
       - name: Download Source Package
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
             name: Sources
 
@@ -108,7 +109,7 @@ jobs:
         run: rpmbuild -D "_topdir $(pwd)" -D "_sourcedir $(pwd)" -ba mozillavpn.spec
 
       - name: Uploading
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
             name: RPM Build
             path: |

diff --git a/.github/workflows/ppa-automation.yaml b/.github/workflows/ppa-automation.yaml
@@ -16,7 +16,7 @@ jobs:
     environment: PPA Automation
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -54,7 +54,7 @@ jobs:
           fi
 
       - name: Uploading sources
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
             name: Sources
             path: .tmp

diff --git a/.github/workflows/test_lottie.yaml b/.github/workflows/test_lottie.yaml
@@ -29,11 +29,11 @@ jobs:
           aqt install-qt --outputdir /opt linux desktop $QTVERSION gcc_64 -m all
 
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Cache grcov
         id: cache-grcov
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: grcov-build/
           key: ${{runner.os}}-grcov-v0.8.9
@@ -64,7 +64,7 @@ jobs:
               -t lcov --branch --ignore-not-existing > ${{github.workspace}}/lottie_lcov.info
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           directory: .
           flags: lottie_tests
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Qt6
         shell: bash
@@ -93,7 +93,7 @@ jobs:
 
       - name: Cache grcov
         id: cache-grcov
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: grcov-build/
           key: ${{runner.os}}-grcov-v0.8.9
@@ -111,7 +111,7 @@ jobs:
           ./scripts/tests/lottie_tests.sh --grcov lottie_lcov.info
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           directory: .
           flags: lottie_tests
@@ -125,7 +125,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Qt
         shell: bash

diff --git a/.github/workflows/test_qml.yaml b/.github/workflows/test_qml.yaml
@@ -22,7 +22,7 @@ jobs:
       QTVERSION: 6.2.4
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
@@ -61,7 +61,7 @@ jobs:
               -t lcov --branch --ignore-not-existing > ${{github.workspace}}/qml_lcov.info
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           directory: .
           flags: qml_tests
@@ -75,7 +75,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Qt6
         shell: bash
@@ -119,7 +119,7 @@ jobs:
           ./scripts/tests/qml_tests.sh --grcov qml_lcov.info
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           directory: .
           flags: qml_tests
@@ -133,7 +133,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Checkout submodules
         shell: bash