diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-21 22:06:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-22 18:58:59 (GMT) |
| commit | f9526f39a10da53563fe056480a1fdc505de5f97 (patch) | |
| tree | 9aa6eb6e01e9986117951d27dcd091ed4ed3dc55 /.gitlab/ci | |
| parent | 6f7580c7ad7de056088a617b212e221e45f5d528 (diff) | |
| download | CMake-f9526f39a10da53563fe056480a1fdc505de5f97.zip CMake-f9526f39a10da53563fe056480a1fdc505de5f97.tar.gz CMake-f9526f39a10da53563fe056480a1fdc505de5f97.tar.bz2 | |
ci: Add bzr and p4 to Debian and Fedora base images
Perforce does not provide binaries for `aarch64`, so leave it out for
that architecture.
Fedora now packages `breezy` instead of the original `bzr`. Note that
breezy does not have the xmloutput plugin needed for `bzr log --xml`.
This is also why commit 1972a75536 (Tests: Drop CTestUpdate.BZR test
check for xmloutput plugin, 2022-02-04) observed that there is no
`bzr xmlplugins` command.
Diffstat (limited to '.gitlab/ci')
| -rwxr-xr-x | .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/debian10/install_deps.sh | 8 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora35/install_deps.sh | 8 |
3 files changed, 17 insertions, 0 deletions
diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh index d5c5e22..21f0b16 100755 --- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh +++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh @@ -25,6 +25,7 @@ apt-get install -y \ # Packages needed to test CTest. apt-get install -y \ + bzr bzr-xmloutput \ cvs \ subversion \ mercurial diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index d3d6b67..12a91e6 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.gitlab/ci/docker/debian10/install_deps.sh @@ -25,6 +25,7 @@ apt-get install -y \ # Packages needed to test CTest. apt-get install -y \ + bzr bzr-xmloutput \ cvs \ subversion \ mercurial @@ -89,4 +90,11 @@ curl -L -O https://github.com/IronLanguages/ironpython2/releases/download/ipy-2. dpkg -i ironpython_2.7.10.deb rm ironpython_2.7.10.deb +# Perforce +curl -L -O https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz +echo '72620c55e9389705582506d6f3388005fb4f674888a00a12a51edc2ae37823b3 helix-core-server.tgz' > helix.sha256sum +sha256sum --check helix.sha256sum +tar -C /usr/local/bin -xvzf helix-core-server.tgz -- p4 p4d +rm helix-core-server.tgz + apt-get clean diff --git a/.gitlab/ci/docker/fedora35/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh index 30214af..038000c 100755 --- a/.gitlab/ci/docker/fedora35/install_deps.sh +++ b/.gitlab/ci/docker/fedora35/install_deps.sh @@ -38,6 +38,7 @@ dnf install --setopt=install_weak_deps=False -y \ # Packages needed to test CTest. dnf install --setopt=install_weak_deps=False -y \ + breezy \ subversion \ mercurial @@ -106,3 +107,10 @@ curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py python2 get-pip.py rm get-pip.py pip2.7 install numpy + +# Perforce +curl -L -O https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz +echo '72620c55e9389705582506d6f3388005fb4f674888a00a12a51edc2ae37823b3 helix-core-server.tgz' > helix.sha256sum +sha256sum --check helix.sha256sum +tar -C /usr/local/bin -xvzf helix-core-server.tgz -- p4 p4d +rm helix-core-server.tgz |