Skip to content

Commit 61c9507

Browse files
committed
Use mullvad version from workflow output
1 parent 8c6e165 commit 61c9507

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

test/scripts/utils/lib.sh

+1-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
66
TEST_FRAMEWORK_ROOT="$SCRIPT_DIR/../.."
77
REPO_ROOT="$TEST_FRAMEWORK_ROOT/.."
88

@@ -23,20 +23,6 @@ function get_test_utils_dir {
2323
RELEASES=$(curl -sf https://api.github.com/repos/mullvad/mullvadvpn-app/releases | jq -r '[.[] | select(((.tag_name|(startswith("android") or startswith("ios"))) | not))]')
2424
LATEST_STABLE_RELEASE=$(jq -r '[.[] | select(.prerelease==false)] | .[0].tag_name' <<<"$RELEASES")
2525

26-
function get_current_version {
27-
local app_dir
28-
app_dir="$REPO_ROOT"
29-
if [ -n "${TEST_DIST_DIR+x}" ]; then
30-
if [ ! -x "${TEST_DIST_DIR%/}/mullvad-version" ]; then
31-
executable_not_found_in_dist_error mullvad-version
32-
fi
33-
"${TEST_DIST_DIR%/}/mullvad-version"
34-
else
35-
cargo run -q --manifest-path="$app_dir/Cargo.toml" --bin mullvad-version
36-
fi
37-
}
38-
39-
CURRENT_VERSION=$(get_current_version)
4026
commit=$(git rev-parse HEAD^\{commit\})
4127
commit=${commit:0:6}
4228

0 commit comments

Comments
 (0)