boost/boost-ci
2
0
Fork 0
mirror of https://github.com/boostorg/boost-ci.git synced 2026-02-09 11:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Unify container software installation for GHA and AzP

Browse Source
This commit is contained in:
Alexander Grund
2021-11-21 14:02:12 +01:00
parent c4c7333ca4
commit eabeb645c6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.azure-pipelines.yml
View File

@@ -111,10 +111,11 @@ stages:
- bash: |
set -ex
/tmp/docker exec -t -u 0 ci-container \
sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::='--force-confold' -y install sudo software-properties-common g++ python"
sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::='--force-confold' -y install sudo software-properties-common"
# Need (newer) git
sudo add-apt-repository ppa:git-core/ppa
sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git
sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ python libpython-dev git
displayName: 'Install required sw for containers'
- bash: |
set -ex

7
.github/workflows/ci.yml vendored
View File

@@ -91,10 +91,11 @@ jobs:
fi
if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common build-essential g++ python libpython-dev
# Need newer git
apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common
# Need (newer) git
add-apt-repository ppa:git-core/ppa
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ python libpython-dev git
fi
git config --global pack.threads 0