echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Add bzr and p4 to Debian and Fedora base images

Browse Source 
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.
This commit is contained in:
Brad King 2022-02-21 17:06:38 -05:00
parent 6f7580c7ad
commit f9526f39a1
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/ci/docker/debian10-aarch64/install_deps.sh
View File

@ -25,6 +25,7 @@ apt-get install -y \
# Packages needed to test CTest.
apt-get install -y \
bzr bzr-xmloutput \
cvs \
subversion \
mercurial

8
.gitlab/ci/docker/debian10/install_deps.sh
View File

@ -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

8
.gitlab/ci/docker/fedora35/install_deps.sh
View File

@ -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

6
.gitlab/os-linux.yml
View File

@ -45,7 +45,7 @@
### Debian
.debian10:
image: "kitware/cmake:ci-debian10-x86_64-2021-11-18"
image: "kitware/cmake:ci-debian10-x86_64-2022-02-21"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@ -60,7 +60,7 @@
CMake_SKIP_INSTALL: 1
.debian10_aarch64:
image: "kitware/cmake:ci-debian10-aarch64-2021-11-18"
image: "kitware/cmake:ci-debian10-aarch64-2022-02-21"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@ -69,7 +69,7 @@
### Fedora
.fedora35:
image: "kitware/cmake:ci-fedora35-x86_64-2022-02-01"
image: "kitware/cmake:ci-fedora35-x86_64-2022-02-21"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"