VPN-7512: Fix Ubuntu/Resolute build (#11116)

* libqt6websockets6-dev was renamed to qt6-websockets-dev
* Migrate off explicit ubuntu-22.04 workflows

Author: oskirby

.github/workflows/add_landing_label.yml

@@ -14,7 +14,7 @@ permissions:
 jobs: 
   add_label: 
       name: Add "Landing Label"
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-slim
       steps:
       - name: Set 
         run: gh pr edit --add-label "🛬 Landing" https://github.com/mozilla-mobile/mozilla-vpn-client/pull/$PR_NUMBER

.github/workflows/auth_tests.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   linux-unit-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Run auth tests on Linux
     steps:
       - name: Clone repository

.github/workflows/gh_pages.yaml

@@ -90,7 +90,7 @@ jobs:
           path: tools/inspector/
 
   addons:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Clone repository
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

.github/workflows/linters.yaml

@@ -13,7 +13,7 @@ on:
 jobs:
   linter:
     name: Run Main Linters (clang, l10n, colors, etc.)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Clone repository
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

.github/workflows/linux.yaml

@@ -16,7 +16,7 @@ concurrency:
 jobs:
   supported-fedora-releases:
     name: Fetch currently supported Fedora releases
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-slim
     outputs:
       supported-releases: ${{ steps.fetch-supported-releases.outputs.releases }}
     steps:
@@ -29,7 +29,7 @@ jobs:
 
   source-bundle:
     name: Source Bundle
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

.github/workflows/linux_tests.yaml

@@ -23,7 +23,7 @@ jobs:
 
   build_test_app:
     name: Build Test Client
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.enumerate.outputs.tests }}
     steps:
@@ -95,7 +95,7 @@ jobs:
     needs:
       - build_test_app
       - build_test_addons
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 45
     strategy:
       fail-fast: false # Don't cancel other jobs if a test fails

.github/workflows/rustlang.yaml

@@ -50,7 +50,7 @@ jobs:
   rust-unit-tests:
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}
     name: Rust unit tests (${{ matrix.os }})

.github/workflows/test_unit.yaml

@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   linux-unit-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Run Unit tests on Linux
     steps:
       - name: Clone repository

.github/workflows/translations.yaml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   translations:
     name: Translations
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       QTVERSION: 6.10.1
 

linux/debian/control

@@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 13),
                libqt6networkauth6-dev (>=6.2.0~),
                libqt6opengl6-dev (>=6.2.0~),
                libqt6svg6-dev (>=6.2.0~),
-               libqt6websockets6-dev (>=6.2.0~),
                libxkbcommon-dev,
                ninja-build,
                qmake6 (>=6.2.0~),
@@ -33,7 +32,8 @@ Build-Depends: debhelper (>= 13),
                qt6-declarative-private-dev (>=6.2.0~),
                qt6-declarative-dev-tools (>=6.2.0~),
                qt6-l10n-tools (>=6.2.0~),
-               qt6-tools-dev-tools (>=6.2.0~)
+               qt6-tools-dev-tools (>=6.2.0~),
+               qt6-websockets-dev (>=6.2.0~) | libqt6websockets6-dev (>=6.2.0~)
 Standards-Version: 4.4.1
 Homepage: https://vpn.mozilla.org/
 Vcs-Git: https://github.com/mozilla-mobile/mozilla-vpn-client