diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2024-03-05 11:36:41 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2024-03-05 11:36:41 +0100 |
| commit | 436a14d46c6f7d4a74f197c02903e11644d5db92 (patch) | |
| tree | 47b61e92bd880024ada80049bc36e60b59dd4a09 /ci | |
| parent | 0b9ac24b94b99e290fae551fdbea4d8e0ed65d9b (diff) | |
| parent | c26fab67d5e90cf1fb311b5315f84e48fddc88fa (diff) | |
| download | mullvadvpn-436a14d46c6f7d4a74f197c02903e11644d5db92.tar.xz mullvadvpn-436a14d46c6f7d4a74f197c02903e11644d5db92.zip | |
Merge remote-tracking branch 'origin/run-shellcheck-in-ci-des-593'
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/ios/buildserver-build-ios.sh | 4 | ||||
| -rw-r--r-- | ci/ios/run-in-vm.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/ios/buildserver-build-ios.sh b/ci/ios/buildserver-build-ios.sh index 9a94a442c6..78449ef07b 100644 --- a/ci/ios/buildserver-build-ios.sh +++ b/ci/ios/buildserver-build-ios.sh @@ -2,7 +2,7 @@ set -eu shopt -s nullglob -TAG_PATTERN_TO_BUILD=("^ios/") +TAG_PATTERN_TO_BUILD="^ios/" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BUILD_DIR="$SCRIPT_DIR/mullvadvpn-app/ios" LAST_BUILT_DIR="$SCRIPT_DIR/last-built" @@ -93,6 +93,8 @@ function run_build_loop() { run_git fetch --prune --tags 2> /dev/null || continue local tags + + # shellcheck disable=SC2207 tags=( $(run_git tag | grep "$TAG_PATTERN_TO_BUILD") ) for tag in "${tags[@]}"; do diff --git a/ci/ios/run-in-vm.sh b/ci/ios/run-in-vm.sh index fb0a719e40..9048b528a1 100644 --- a/ci/ios/run-in-vm.sh +++ b/ci/ios/run-in-vm.sh @@ -22,9 +22,7 @@ vm_pid=$! # Sleep to wait until VM is up sleep 10 -# apparently, there's a difference between piping into zsh like this and doing -# a <(echo $SCRIPT). -cat "$SCRIPT" | ssh admin@"$(tart ip "$VM_NAME")" bash /dev/stdin +ssh admin@"$(tart ip "$VM_NAME")" bash /dev/stdin < "$SCRIPT" script_status=$? kill $vm_pid |