Skip to content

Commit acf5cd4

Browse files
committed
Try always running mullvad-version in test-step
1 parent bea09e5 commit acf5cd4

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

test/scripts/utils/lib.sh

+2-9
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

@@ -26,14 +26,7 @@ LATEST_STABLE_RELEASE=$(jq -r '[.[] | select(.prerelease==false)] | .[0].tag_nam
2626
function get_current_version {
2727
local app_dir
2828
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
29+
cargo run -q --manifest-path="$app_dir/Cargo.toml" --bin mullvad-version
3730
}
3831

3932
CURRENT_VERSION=$(get_current_version)

0 commit comments

Comments
 (0)