Update github actions workflows

7 files changed, 29 insertions, 28 deletions

diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index d2c93d388a..df892cd170 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -12,7 +12,7 @@ on:
       - '!dist-assets/**'
       - '!docs/**'
       - '!graphics/**'
-      - '!gui/**'
+      - '!desktop/**'
       - '!ios/**'
       - '!test/**'
       - '!scripts/**'
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml
index 818d5eb68f..a0d793fa7f 100644
--- a/.github/workflows/daemon.yml
+++ b/.github/workflows/daemon.yml
@@ -18,7 +18,7 @@ on:
       - '!deny.toml'
       - '!docs/**'
       - '!graphics/**'
-      - '!gui/**'
+      - '!desktop/**'
       - '!ios/**'
       - '!scripts/**'
       - '!.*ignore'
diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml
index 76cb144e33..6c1e5c99ee 100644
--- a/.github/workflows/desktop-e2e.yml
+++ b/.github/workflows/desktop-e2e.yml
@@ -130,7 +130,7 @@ jobs:
           USE_MOLD: false
         run: ./build.sh
       - name: Build test executable
-        run: ./gui/scripts/build-test-executable.sh
+        run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh
       - uses: actions/upload-artifact@v3
         if: '!cancelled()'
         with:
@@ -191,9 +191,9 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/setup-node@v4
         with:
-          node-version-file: gui/package.json
+          node-version-file: desktop/package.json
           cache: 'npm'
-          cache-dependency-path: gui/package-lock.json
+          cache-dependency-path: desktop/package-lock.json
       - name: Install Rust
         uses: actions-rs/toolchain@v1.0.6
         with:
@@ -209,7 +209,7 @@ jobs:
         run: ./build.sh
       - name: Build test executable
         shell: bash
-        run: ./gui/scripts/build-test-executable.sh
+        run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh
       - uses: actions/upload-artifact@v3
         if: '!cancelled()'
         with:
@@ -273,9 +273,9 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/setup-node@v4
         with:
-          node-version-file: gui/package.json
+          node-version-file: desktop/package.json
           cache: 'npm'
-          cache-dependency-path: gui/package-lock.json
+          cache-dependency-path: desktop/package-lock.json
       - name: Install Rust
         uses: actions-rs/toolchain@v1.0.6
         with:
@@ -284,7 +284,7 @@ jobs:
       - name: Build app
         run: ./build.sh
       - name: Build test executable
-        run: ./gui/scripts/build-test-executable.sh
+        run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh
       - uses: actions/upload-artifact@v3
         if: '!cancelled()'
         with:
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 3b6bc373e4..5d7cec1611 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - .github/workflows/frontend.yml
-      - gui/**
+      - desktop/**
       - mullvad-management-interface/proto/**
   workflow_dispatch:
 
@@ -34,46 +34,46 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version-file: gui/package.json
+          node-version-file: desktop/package.json
           cache: 'npm'
-          cache-dependency-path: gui/package-lock.json
+          cache-dependency-path: desktop/package-lock.json
 
       - name: Install dependencies
-        working-directory: gui
+        working-directory: desktop
         shell: bash
         run: npm ci
 
       - name: Check formatting
         if: matrix.os == 'ubuntu-latest'
-        working-directory: gui
+        working-directory: desktop
         shell: bash
         run: npm run lint
 
       - name: Build
-        working-directory: gui
+        working-directory: desktop
         shell: bash
-        run: npm run build
+        run: npm run build -w mullvad-vpn
 
       - name: Run headless test Linux
         if: runner.os == 'Linux'
-        working-directory: gui
+        working-directory: desktop
         run: xvfb-run -a npm test
 
       - name: Run headless test Windows
         if: runner.os != 'Linux'
-        working-directory: gui
+        working-directory: desktop
         shell: bash
         run: npm test
 
       - name: Run Playwright tests on Linux
         if: runner.os == 'Linux'
-        working-directory: gui
+        working-directory: desktop
         # The sandbox is disabled as a workaround for lacking userns permisisons which is required
         # since Ubuntu 24.04.
-        run: NO_SANDBOX=1 npm run e2e:no-build
+        run: NO_SANDBOX=1 npm run e2e:no-build -w mullvad-vpn
 
       - name: Run Playwright tests on Windows
         if: runner.os != 'Linux'
-        working-directory: gui
+        working-directory: desktop
         shell: bash
-        run: npm run e2e:no-build
+        run: npm run e2e:no-build --w mullvad-vpn
diff --git a/.github/workflows/testframework.yml b/.github/workflows/testframework.yml
index 8b8e7759d5..cc9c597ded 100644
--- a/.github/workflows/testframework.yml
+++ b/.github/workflows/testframework.yml
@@ -17,7 +17,7 @@ on:
       - '!deny.toml'
       - '!docs/**'
       - '!graphics/**'
-      - '!gui/**'
+      - '!desktop/**'
       - '!ios/**'
       - '!scripts/**'
       - '!.*ignore'
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index 2aacd840ec..61d2f53827 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -7,7 +7,7 @@ on:
       - android/translations-converter/**
       - android/lib/resource/src/**/plurals.xml
       - android/lib/resource/src/**/strings.xml
-      - gui/**
+      - desktop/packages/mullvad-vpn/**
       - '!**/osv-scanner.toml'
   workflow_dispatch:
 
@@ -23,12 +23,12 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version-file: gui/package.json
+          node-version-file: desktop/package.json
           cache: 'npm'
-          cache-dependency-path: gui/package-lock.json
+          cache-dependency-path: desktop/package-lock.json
 
       - name: Install JS dependencies
-        working-directory: gui
+        working-directory: desktop
         shell: bash
         run: npm ci
 
diff --git a/.github/workflows/verify-locked-down-signatures.yml b/.github/workflows/verify-locked-down-signatures.yml
index 12d4ab3068..8dfe69faf5 100644
--- a/.github/workflows/verify-locked-down-signatures.yml
+++ b/.github/workflows/verify-locked-down-signatures.yml
@@ -11,7 +11,8 @@ on:
       - test/Cargo.lock
       - deny.toml
       - test/deny.toml
-      - gui/package-lock.json
+      - desktop/package-lock.json
+      - desktop/packages/mullvad-vpn/package-lock.json
       - wireguard-go-rs/libwg/go.sum
       - ci/keys/**
       - ci/verify-locked-down-signatures.sh