v29.4-roots.4 · Commit 22: [PATCH 22/37] ci: consolidate sanitizer and apt workflows
ci/test/01_base_install.sh
Before: ci/test/01_base_install.sh · After: ci/test/01_base_install.sh
File metadata
index 592c548b25c7ebf3b82bbfce99d6d4081738d668..bc6820a8019f648d6540938a457060fa2a022d03 100755
Download original patch · Release notes
Diff rows 1–25 of 25. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.
ci/test/01_base_install.sh
CHANGED
|
@@ -8,6 +8,9 @@ export LC_ALL=C.UTF-8
|
|
| 8 |
|
| 9 |
set -ex
|
| 10 |
|
|
|
|
|
|
|
|
|
|
| 11 |
CFG_DONE="ci.base-install-done" # Use a global git setting to remember whether this script ran to avoid running it twice
|
| 12 |
|
| 13 |
if [ "$(git config --global ${CFG_DONE})" == "true" ]; then
|
|
@@ -22,7 +25,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
|
|
| 22 |
fi
|
| 23 |
|
| 24 |
if [ -n "${APT_LLVM_V}" ]; then
|
| 25 |
-
${CI_RETRY_EXE} apt-get -o APT::Update::Error-Mode=any update
|
| 26 |
${CI_RETRY_EXE} apt-get install curl -y
|
| 27 |
curl "https://apt.llvm.org/llvm-snapshot.gpg.key" | tee "/etc/apt/trusted.gpg.d/apt.llvm.org.asc"
|
| 28 |
(
|
|
@@ -39,7 +42,7 @@ elif [ "$CI_OS_NAME" != "macos" ]; then
|
|
| 39 |
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
|
| 40 |
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
|
| 41 |
fi
|
| 42 |
-
${CI_RETRY_EXE} apt-get -o APT::Update::Error-Mode=any update
|
| 43 |
${CI_RETRY_EXE} bash -c "apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $CI_BASE_PACKAGES"
|
| 44 |
fi
|
| 45 |
|
|
|
|
| 8 |
|
| 9 |
set -ex
|
| 10 |
|
| 11 |
+
# shellcheck source=apt.sh
|
| 12 |
+
source "$(dirname "${BASH_SOURCE[0]}")/apt.sh"
|
| 13 |
+
|
| 14 |
CFG_DONE="ci.base-install-done" # Use a global git setting to remember whether this script ran to avoid running it twice
|
| 15 |
|
| 16 |
if [ "$(git config --global ${CFG_DONE})" == "true" ]; then
|
|
|
|
| 25 |
fi
|
| 26 |
|
| 27 |
if [ -n "${APT_LLVM_V}" ]; then
|
| 28 |
+
ci_retry_apt_update
|
| 29 |
${CI_RETRY_EXE} apt-get install curl -y
|
| 30 |
curl "https://apt.llvm.org/llvm-snapshot.gpg.key" | tee "/etc/apt/trusted.gpg.d/apt.llvm.org.asc"
|
| 31 |
(
|
|
|
|
| 42 |
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
|
| 43 |
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
|
| 44 |
fi
|
| 45 |
+
ci_retry_apt_update
|
| 46 |
${CI_RETRY_EXE} bash -c "apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $CI_BASE_PACKAGES"
|
| 47 |
fi
|
| 48 |
|