Skip to content

Commit b705bad

Browse files
committed
ci: Export IN_GETOPT_BIN on macOS
This variable is required for the `retry` script.
1 parent 1c2132d commit b705bad

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ci/test/01_base_install.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,8 @@ elif [ "$CI_OS_NAME" != "macos" ]; then
3131
fi
3232

3333
if [ -n "$PIP_PACKAGES" ]; then
34-
if [ "$CI_OS_NAME" == "macos" ]; then
35-
# shellcheck disable=SC2086
36-
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
37-
else
38-
# shellcheck disable=SC2086
39-
${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
40-
fi
34+
# shellcheck disable=SC2086
35+
${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
4136
fi
4237

4338
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then

ci/test/02_run_container.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ else
5454
mkdir -p "${PREVIOUS_RELEASES_DIR}"
5555
fi
5656

57+
if [ "$CI_OS_NAME" == "macos" ]; then
58+
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt"
59+
export IN_GETOPT_BIN
60+
fi
61+
5762
CI_EXEC () {
5863
$CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH && cd \"${BASE_ROOT_DIR}\" && $*"
5964
}

0 commit comments

Comments
 (0)