fixup! Output app version directly from workflow

Author: Serock3

.github/workflows/desktop-e2e.yml

@@ -9,23 +9,24 @@
 name: Desktop - End-to-end tests
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
   workflow_dispatch:
     inputs:
       oses:
-        description: "Space-delimited list of targets to run tests on, e.g. `debian12 ubuntu2004`. \
+        description:
+          "Space-delimited list of targets to run tests on, e.g. `debian12 ubuntu2004`. \
           Available images:\n
           `debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2404 ubuntu2410 fedora39 \
           fedora40 fedora41 windows10 windows11 macos12 macos13 macos14 macos15`.\n
           Default images:\n
           `debian12 ubuntu2004 ubuntu2204 ubuntu2404 ubuntu2410 fedora39 \
           fedora40 fedora41 windows10 windows11 macos13 macos14 macos15`."
-        default: ''
+        default: ""
         required: false
         type: string
       tests:
         description: "Tests to run (defaults to all if empty)"
-        default: ''
+        default: ""
         required: false
         type: string
 
@@ -95,7 +96,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Use custom container image if specified
         if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
+        run:
+          echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
           >> $GITHUB_ENV
       - name: Use default container image and resolve digest
         if: ${{ github.event.inputs.override_container_image == '' }}
@@ -145,7 +147,7 @@ jobs:
         run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh
       - name: Upload app
         uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: linux-build
           path: |
@@ -160,9 +162,7 @@ jobs:
     container:
       image: ${{ needs.prepare-linux.outputs.container_image }}
     if: |
-      !cancelled() &&
-      needs.prepare-matrices.outputs.linux_matrix != '[]' &&
-      needs.prepare-matrices.outputs.linux_matrix != ''
+      !cancelled()
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:
       # https://github.com/actions/runner/issues/863
@@ -196,7 +196,7 @@ jobs:
       - name: Build test-manager
         run: ./test/scripts/container-run.sh cargo build --package test-manager --release
       - uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: linux-test-manager-build
           path: |
@@ -228,7 +228,7 @@ jobs:
             "$CARGO_TARGET_DIR/x86_64-unknown-linux-gnu/release/test-runner" \
             "$CARGO_TARGET_DIR/x86_64-unknown-linux-gnu/release/connection-checker"
       - uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: linux-test-runner-binaries
           path: bin/*
@@ -247,6 +247,7 @@ jobs:
       ]
     if: |
       !cancelled() &&
+      needs.get-app-version.result == 'success' &&
       needs.prepare-matrices.outputs.linux_matrix != '[]' &&
       needs.prepare-matrices.outputs.linux_matrix != ''
     runs-on: [self-hosted, desktop-test, Linux] # app-test-linux
@@ -299,7 +300,7 @@ jobs:
           ./test/scripts/run/ci.sh ${{ matrix.os }}
       - name: Upload test report
         uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: ${{ matrix.os }}_report
           path: ./test/.ci-logs/${{ matrix.os }}_report
@@ -325,7 +326,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: desktop/package.json
-          cache: 'npm'
+          cache: "npm"
           cache-dependency-path: desktop/package-lock.json
       - name: Install Rust
         run: rustup target add i686-pc-windows-msvc
@@ -353,7 +354,7 @@ jobs:
         shell: bash
         run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh
       - uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: windows-build
           path: .\dist\*.exe
@@ -362,6 +363,7 @@ jobs:
     needs: [prepare-matrices, build-windows, get-app-version]
     if: |
       !cancelled() &&
+      needs.get-app-version.result == 'success' &&
       needs.prepare-matrices.outputs.windows_matrix != '[]' &&
       needs.prepare-matrices.outputs.windows_matrix != ''
     name: Windows end-to-end tests
@@ -389,7 +391,7 @@ jobs:
           ./test/scripts/run/ci.sh ${{ matrix.os }}
       - name: Upload test report
         uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: ${{ matrix.os }}_report
           path: ./test/.ci-logs/${{ matrix.os }}_report
@@ -419,14 +421,14 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: desktop/package.json
-          cache: 'npm'
+          cache: "npm"
           cache-dependency-path: desktop/package-lock.json
       - name: Build app
         run: ./build.sh
       - name: Build test executable
         run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh
       - uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: macos-build
           path: |
@@ -437,6 +439,7 @@ jobs:
     needs: [prepare-matrices, build-macos, get-app-version]
     if: |
       !cancelled() &&
+      needs.get-app-version.result == 'success' &&
       needs.prepare-matrices.outputs.macos_matrix != '[]' &&
       needs.prepare-matrices.outputs.macos_matrix != ''
     name: macOS end-to-end tests
@@ -464,23 +467,23 @@ jobs:
           ./test/scripts/run/ci.sh ${{ matrix.os }}
       - name: Upload test report
         uses: actions/upload-artifact@v4
-        if: '!cancelled()'
+        if: "!cancelled()"
         with:
           name: ${{ matrix.os }}_report
           path: ./test/.ci-logs/${{ matrix.os }}_report
 
   compile-test-matrix:
     name: Result matrix
     needs: [e2e-test-linux, e2e-test-windows, e2e-test-macos]
-    if: '!cancelled()'
+    if: "!cancelled()"
     runs-on: ubuntu-latest
     container:
       image: ${{ needs.prepare-linux.outputs.container_image }}
     steps:
       - name: Download test report
         uses: actions/download-artifact@v4
         with:
-          pattern: '*_report'
+          pattern: "*_report"
           merge-multiple: true
       - name: Create binaries directory
         shell: bash -ieo pipefail {0}