diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-03-17 16:14:17 +0100 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-03-18 11:07:47 +0100 |
| commit | 2d13f914dacb74b37323ee836461ab56aa2ad10f (patch) | |
| tree | 929af9ad795753fc0f5eee1b919e4ca8d9386c03 | |
| parent | 53cbd13dac94cb74fdb0688c0abc92b32bb50bba (diff) | |
| download | mullvadvpn-2d13f914dacb74b37323ee836461ab56aa2ad10f.tar.xz mullvadvpn-2d13f914dacb74b37323ee836461ab56aa2ad10f.zip | |
Use mullvad version from workflow output
| -rwxr-xr-x | test/scripts/utils/lib.sh | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/test/scripts/utils/lib.sh b/test/scripts/utils/lib.sh index 55b98f89cb..0a00b95f8b 100755 --- a/test/scripts/utils/lib.sh +++ b/test/scripts/utils/lib.sh @@ -2,7 +2,7 @@ set -eu -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" TEST_FRAMEWORK_ROOT="$SCRIPT_DIR/../.." REPO_ROOT="$TEST_FRAMEWORK_ROOT/.." @@ -23,20 +23,6 @@ function get_test_utils_dir { RELEASES=$(curl -sf https://api.github.com/repos/mullvad/mullvadvpn-app/releases | jq -r '[.[] | select(((.tag_name|(startswith("android") or startswith("ios"))) | not))]') LATEST_STABLE_RELEASE=$(jq -r '[.[] | select(.prerelease==false)] | .[0].tag_name' <<<"$RELEASES") -function get_current_version { - local app_dir - app_dir="$REPO_ROOT" - if [ -n "${TEST_DIST_DIR+x}" ]; then - if [ ! -x "${TEST_DIST_DIR%/}/mullvad-version" ]; then - executable_not_found_in_dist_error mullvad-version - fi - "${TEST_DIST_DIR%/}/mullvad-version" - else - cargo run -q --manifest-path="$app_dir/Cargo.toml" --bin mullvad-version - fi -} - -CURRENT_VERSION=$(get_current_version) commit=$(git rev-parse HEAD^\{commit\}) commit=${commit:0:6} |