diff --git a/.github/scripts/apple-signing/setup.sh b/.github/scripts/apple-signing/setup.sh index 1c482cbf6..6fa7e44ac 100755 --- a/.github/scripts/apple-signing/setup.sh +++ b/.github/scripts/apple-signing/setup.sh @@ -6,6 +6,7 @@ IS_SNAPSHOT="$1" ## grab utilities SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) . "$SCRIPT_DIR"/utils.sh +mkdir -p "$SCRIPT_DIR/log" main() { @@ -33,17 +34,13 @@ main() { echo -n "$MAC_SIGNING_IDENTITY" > "$SCRIPT_DIR/$SIGNING_IDENTITY_FILENAME" } -set +u -if [ -z "$SCRIPT" ] -then +# capture all output from a subshell to log output additionally to a file (as well as the terminal) +( ( + set +u + if [ -n "$SKIP_SIGNING" ]; then + commentary "skipping signing setup..." + else set -u - # log all output - mkdir -p "$SCRIPT_DIR/log" - /usr/bin/script "$SCRIPT_DIR/log/setup.txt" /bin/bash -c "$0 $*" - exit $? -elif [ -n "$SKIP_SIGNING" ]; then - commentary "skipping signing setup..." -else - set -u - main -fi + main + fi +) 2>&1) | tee "$SCRIPT_DIR/log/setup.txt" \ No newline at end of file diff --git a/.github/scripts/apple-signing/sign.sh b/.github/scripts/apple-signing/sign.sh index 0519029a0..00caaee5f 100755 --- a/.github/scripts/apple-signing/sign.sh +++ b/.github/scripts/apple-signing/sign.sh @@ -7,6 +7,7 @@ IS_SNAPSHOT="$2" ## grab utilities SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) . "$SCRIPT_DIR"/utils.sh +mkdir -p "$SCRIPT_DIR/log" # sign_binary [binary-path] [signing-identity] @@ -124,17 +125,13 @@ main() { fi } -set +u -if [ -z "$SCRIPT" ] -then +# capture all output from a subshell to log output additionally to a file (as well as the terminal) +( ( + set +u + if [ -n "$SKIP_SIGNING" ]; then + commentary "skipping signing setup..." + else set -u - # log all output - mkdir -p "$SCRIPT_DIR/log" - /usr/bin/script "$SCRIPT_DIR/log/signing-$(basename $ARCHIVE_PATH).txt" /bin/bash -c "$0 $*" - exit $? -elif [ -n "$SKIP_SIGNING" ]; then - commentary "skipping signing..." -else - set -u - main -fi + main + fi +) 2>&1) | tee "$SCRIPT_DIR/log/signing-$(basename $ARCHIVE_PATH).txt" \ No newline at end of file diff --git a/test/install/test_harness.sh b/test/install/test_harness.sh index 4d7b8790c..0a1acec3a 100644 --- a/test/install/test_harness.sh +++ b/test/install/test_harness.sh @@ -94,7 +94,7 @@ setup_snapshot_server() { worker_pid=$! # it takes some time for the server to be ready... - sleep 0.5 + sleep 3 echo "$worker_pid" }