v30.3-roots.1 · Commit 22: [PATCH 22/68] 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 2cec3e853ab60a688ce171a8d953642137b0ed3a..2dce808e3f0b13a38a2e01d88c4492b939bf8aac 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 -o errexit -o pipefail -o xtrace
|
| 10 |
|
|
|
|
|
|
|
|
|
|
| 11 |
CFG_DONE="${BASE_ROOT_DIR}/ci.base-install-done" # Use a global setting to remember whether this script ran to avoid running it twice
|
| 12 |
|
| 13 |
if [ "$( cat "${CFG_DONE}" || true )" == "done" ]; 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 |
(
|
|
@@ -40,7 +43,7 @@ elif [ "$CI_OS_NAME" != "macos" ]; then
|
|
| 40 |
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
|
| 41 |
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
|
| 42 |
fi
|
| 43 |
-
${CI_RETRY_EXE} apt-get -o APT::Update::Error-Mode=any update
|
| 44 |
${CI_RETRY_EXE} bash -c "apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $CI_BASE_PACKAGES"
|
| 45 |
fi
|
| 46 |
|
|
|
|
| 8 |
|
| 9 |
set -o errexit -o pipefail -o xtrace
|
| 10 |
|
| 11 |
+
# shellcheck source=apt.sh
|
| 12 |
+
source "$(dirname "${BASH_SOURCE[0]}")/apt.sh"
|
| 13 |
+
|
| 14 |
CFG_DONE="${BASE_ROOT_DIR}/ci.base-install-done" # Use a global setting to remember whether this script ran to avoid running it twice
|
| 15 |
|
| 16 |
if [ "$( cat "${CFG_DONE}" || true )" == "done" ]; 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 |
(
|
|
|
|
| 43 |
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
|
| 44 |
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
|
| 45 |
fi
|
| 46 |
+
ci_retry_apt_update
|
| 47 |
${CI_RETRY_EXE} bash -c "apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $CI_BASE_PACKAGES"
|
| 48 |
fi
|
| 49 |
|