diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2021-06-09 13:31:03 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2021-06-09 13:31:03 +0200 |
| commit | 8a10bac813982653cefff5cb4d47cb71e2aeee0a (patch) | |
| tree | 8e469c6c8453695efef368f17d558f75e706da70 | |
| parent | 229d527d590a4cd2d12ba6b9f86a51880f3ecdf6 (diff) | |
| parent | 9e7f07cf92303eae5c5f07952b26e91ebb13711e (diff) | |
| download | mullvadvpn-8a10bac813982653cefff5cb4d47cb71e2aeee0a.tar.xz mullvadvpn-8a10bac813982653cefff5cb4d47cb71e2aeee0a.zip | |
Merge branch 'fix-calling-env.sh'
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | prepare-release.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -242,7 +242,7 @@ function buildTargets() { build "$t" done else - source env.sh + source env.sh "" build fi } diff --git a/prepare-release.sh b/prepare-release.sh index 77d093593a..9286d128a7 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -57,7 +57,7 @@ echo "Updating version in metadata files..." ./version-metadata.sh inject $PRODUCT_VERSION $VERSION_METADATA_ARGS echo "Syncing Cargo.lock with new version numbers" -source env.sh +source env.sh "" # If cargo exits with a non zero exit status and it's not a timeout (exit code 124) it's an error set +e timeout 5s cargo +stable build |