Skip to content

Commit 9945a92

Browse files
committed
trying a full solution
Signed-off-by: Nell Shamrell <[email protected]>
1 parent 851fe15 commit 9945a92

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/ci/scripts/setup-environment.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,15 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1111
# Since matrix variables are readonly in Azure Pipelines, we take
1212
# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS
1313
# which downstream steps can alter
14-
#if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then
15-
16-
#if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then
17-
#INITIAL_RUST_CONFIG=${INITIAL_RUST_CONFIGURE_ARGS}
18-
14+
# MacOS ships with Bash 3.16, which means we cannot use
15+
# if [[ -v FOO ]], as that was introduced in Bash 4.2
1916
if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then
2017
INITIAL_RUST_CONFIG=""
18+
echo "No initial Rust Configure Args set"
2119
else
2220
INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}"
21+
ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}"
2322
fi
24-
#if [ -z ${INITIAL_RUST_CONFIG}]; then
25-
# ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}"
26-
#else
27-
# echo "No initial Rust Configure Args set"
28-
#fi
2923

3024
# Builders starting with `dist-` are dist builders, but if they also end with
3125
# `-alt` they are alternate dist builders.

0 commit comments

Comments
 (0)