Output mullvad version string directly from job

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: |
@@ -157,6 +159,8 @@ jobs:
     name: Build mullvad-version
     needs: prepare-linux
     runs-on: ubuntu-latest
+    outputs:
+      mullvad-version: ${{ steps.cargo-run.outputs.mullvad-version }}
     container:
       image: ${{ needs.prepare-linux.outputs.container_image }}
     if: |
@@ -171,18 +175,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Build mullvad-version
+        id: cargo-run
         run: |
-          cargo build --package mullvad-version --release
-          # Move `mullvad-version` to a known location. This is needed in the coming `upload-artifact` step.
-          mkdir bin
-          mv -t ./bin/ "$CARGO_TARGET_DIR/release/mullvad-version"
+          version=$(cargo run --package mullvad-version -q)
+          echo "mullvad-version=$(version)"
+          echo "mullvad-version=${version}" >> "$GITHUB_OUTPUT"
         shell: bash
-      - name: Upload mullvad-version
-        uses: actions/upload-artifact@v4
-        with:
-          name: mullvad-version-linux
-          path: ./bin/mullvad-version
-          if-no-files-found: error
 
   # This step should always be run because the `test-manager` binary is used to compile the
   # result matrix at the end! If that functionality is ever split out from the `test-manager`,
@@ -199,7 +197,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: |
@@ -231,7 +229,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/*
@@ -240,7 +238,14 @@ jobs:
   e2e-test-linux:
     name: Linux end-to-end tests
     # yamllint disable-line rule:line-length
-    needs: [prepare-matrices, build-linux-app, build-mullvad-version-linux, build-test-manager-linux, build-test-runner-binaries-linux]
+    needs:
+      [
+        prepare-matrices,
+        build-linux-app,
+        build-mullvad-version-linux,
+        build-test-manager-linux,
+        build-test-runner-binaries-linux,
+      ]
     if: |
       !cancelled() &&
       needs.prepare-matrices.outputs.linux_matrix != '[]' &&
@@ -266,11 +271,6 @@ jobs:
         with:
           name: linux-test-manager-build
           path: ${{ github.workspace }}/bin
-      - name: Download mullvad-version
-        uses: actions/download-artifact@v4
-        with:
-          name: mullvad-version-linux
-          path: ${{ github.workspace }}/bin
       - name: Download Test Runner binaries
         uses: actions/download-artifact@v4
         if: ${{ needs.build-test-runner-binaries-linux.result == 'success' }}
@@ -290,17 +290,17 @@ jobs:
       - name: Run end-to-end tests
         shell: bash -ieo pipefail {0}
         run: |
+          echo "${{needs.build-mullvad-version-linux.outputs.mullvad-version}}"
           # A directory with all the binaries is required to run test-manager.
           # The test scripts which runs in CI expects this folder to be available as the `TEST_DIST_DIR` variable.
           export TEST_DIST_DIR="${{ github.workspace }}/bin/"
           git fetch --tags --prune-tags --force
           export TEST_FILTERS="${{ github.event.inputs.tests }}"
           ls -la "$TEST_DIST_DIR"
-          ${{ github.workspace }}/bin/mullvad-version
           ./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
@@ -326,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
@@ -354,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
@@ -389,7 +389,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 +419,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: |
@@ -463,23 +463,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}