diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-03-18 10:21:44 +0100 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-03-18 11:07:47 +0100 |
| commit | 321ac006318d707e1a0dfdeee1fce6761d090932 (patch) | |
| tree | dc02ef350df45a8cea77fa5b24400b452dbb25bd /test/scripts/run | |
| parent | afa2f5d20dab686d7ac3d13de3d42772ff7a4bb1 (diff) | |
| download | mullvadvpn-321ac006318d707e1a0dfdeee1fce6761d090932.tar.xz mullvadvpn-321ac006318d707e1a0dfdeee1fce6761d090932.zip | |
Move `CURRENT_VERSION` out of `lib.sh`
Diffstat (limited to 'test/scripts/run')
| -rwxr-xr-x | test/scripts/run/ci.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/test/scripts/run/ci.sh b/test/scripts/run/ci.sh index 67f87f241c..b7e8c218e4 100755 --- a/test/scripts/run/ci.sh +++ b/test/scripts/run/ci.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# This script is invoked by the GitHub workflow file below to launch the desktop end to end test framwork. +# <https://github.com/mullvad/mullvadvpn-app/blob/main/.github/workflows/desktop-e2e.yml> + # TODO: Break this down into multiple, smaller scripts and compose them in this file. set -eu @@ -28,6 +31,15 @@ fi # shellcheck source=test/scripts/utils/lib.sh source "../utils/lib.sh" +# The `CURRENT_VERSION` variable is set by the workflow file which invokes `mullvad-version` +# We need to add a suffix with tag information to get the current version string +TAG=$(git describe --exact-match HEAD 2>/dev/null || echo "") +if [[ -n "$TAG" && ${CURRENT_VERSION} =~ -dev- ]]; then + # Remove disallowed version characters from the tag + CURRENT_VERSION+="+${TAG//[^0-9a-z_-]/}" +fi +export CURRENT_VERSION + echo "**********************************" echo "* Version to upgrade from: $LATEST_STABLE_RELEASE" echo "* Version to test: $CURRENT_VERSION" |