Skip to content

Commit

Permalink
Merge branch 'main' into fix_vcpkg
Browse files Browse the repository at this point in the history
  • Loading branch information
msclock authored Apr 20, 2024
2 parents e6aeaf2 + 85f4817 commit 357df62
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/gitlab-ci-local/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ install_debian_packages() {
export DEBIAN_FRONTEND=noninteractive

local package_list=(curl
ca-certificates)
ca-certificates
git)

if ! dpkg -s "${package_list[@]}" >/dev/null 2>&1; then
apt_get_update_if_needed
Expand Down Expand Up @@ -118,6 +119,10 @@ install_redhat_packages() {
package_list+=(curl)
fi

# Install git if not already installed (may be more recent than distro version)
if ! type git >/dev/null 2>&1; then
package_list+=(git)
fi
${install_cmd} -y install "${package_list[@]}"
}

Expand All @@ -128,6 +133,10 @@ install_alpine_packages() {
apk add --no-cache \
curl \
ca-certificates
# Install git if not already installed (may be more recent than distro version)
if ! type git >/dev/null 2>&1; then
apk add --no-cache git
fi
}

# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
Expand Down

0 comments on commit 357df62

Please sign in to comment.