summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-03-12 14:47:39 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-03-12 14:47:39 +0100
commit619276793f4162e92da4d02b072e10f3ed24a0da (patch)
tree2b1d2a224cb0cc9140a725acdfb86b8a0986ed84
parent1031e18025e4f957a3350cc857db6c11b94c02ea (diff)
parente049dd1f5c3b12162e5f7d21f364583053eea213 (diff)
downloadmullvadvpn-619276793f4162e92da4d02b072e10f3ed24a0da.tar.xz
mullvadvpn-619276793f4162e92da4d02b072e10f3ed24a0da.zip
Merge branch 'fix-macos-e2e-desktop-workflow'
-rw-r--r--.github/workflows/desktop-e2e.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml
index 756d178c77..37d6c2b880 100644
--- a/.github/workflows/desktop-e2e.yml
+++ b/.github/workflows/desktop-e2e.yml
@@ -184,15 +184,14 @@ jobs:
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`,
+ # this step may be conditionally run.
build-test-manager-linux:
name: Build Test Manager
needs: prepare-linux
# Note: libssl-dev is installed on the test server, so build test-manager there for the sake of simplicity
runs-on: [self-hosted, desktop-test, Linux] # app-test-linux
- if: |
- !cancelled() &&
- needs.prepare-matrices.outputs.linux_matrix != '[]' &&
- needs.prepare-matrices.outputs.linux_matrix != ''
steps:
- name: Checkout repository
uses: actions/checkout@v4