diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-10-23 15:34:00 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-10-23 15:55:59 +0200 |
| commit | 102601fe295c96f54d4f23e443da598ea303e603 (patch) | |
| tree | 01fb807963f9c0beb8f8dba896025e67e06683f1 | |
| parent | d1c87a3bc51368dc6a816172808b09af7d150508 (diff) | |
| download | mullvadvpn-102601fe295c96f54d4f23e443da598ea303e603.tar.xz mullvadvpn-102601fe295c96f54d4f23e443da598ea303e603.zip | |
Add option to run e2e with GotaTun
| -rw-r--r-- | .github/workflows/desktop-e2e.yml | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml index ea332840d0..64e8602fd1 100644 --- a/.github/workflows/desktop-e2e.yml +++ b/.github/workflows/desktop-e2e.yml @@ -32,6 +32,9 @@ on: default: '' required: false type: string + gotatun: + type: boolean + description: "Run tests with GotaTun 🦀" permissions: {} @@ -143,9 +146,15 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Build app + if: ${{ !github.event.inputs.gotatun }} run: | export CARGO_TARGET_DIR=target/ ./build.sh --optimize + - name: Build app (with GotaTun 🦀) + if: ${{ github.event.inputs.gotatun }} + run: | + export CARGO_TARGET_DIR=target/ + ./build.sh --optimize --boringtun - name: Build test executable run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh - name: Upload app @@ -327,6 +336,7 @@ jobs: uses: actions/checkout@v4 - uses: ./.github/actions/mullvad-build-env - name: Build app + if: ${{ !github.event.inputs.gotatun }} shell: bash run: | ./build.sh @@ -338,6 +348,19 @@ jobs: new_file=$(echo $original_file | perl -pe "s/^(MullvadVPN-.*?)(_x64|_arm64)?(\.exe)$/\1\3/p") mv "$original_file" "$new_file" popd + - name: Build app (with GotaTun 🦀) + if: ${{ github.event.inputs.gotatun }} + shell: bash + run: | + ./build.sh --optimize --boringtun + # FIXME: Strip architecture-specific suffix. The remaining steps assume that the windows installer has no + # arch-suffix. This should probably be addressed when we add a Windows arm runner. Or maybe it will just keep + # on working ¯\_(ツ)_/¯ + pushd dist + original_file=$(find *.exe) + new_file=$(echo $original_file | perl -pe "s/^(MullvadVPN-.*?)(_x64|_arm64)?(\.exe)$/\1\3/p") + mv "$original_file" "$new_file" + popd - name: Build test executable shell: bash run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh @@ -420,7 +443,11 @@ jobs: uses: actions/checkout@v4 - uses: ./.github/actions/mullvad-build-env - name: Build app + if: ${{ !github.event.inputs.gotatun }} run: ./build.sh + - name: Build app (with GotaTun 🦀) + if: ${{ github.event.inputs.gotatun }} + run: ./build.sh --optimize --boringtun - name: Build test executable run: ./desktop/packages/mullvad-vpn/scripts/build-test-executable.sh - uses: actions/upload-artifact@v4 |