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

ci: Add rbenv to Debian and Fedora base images

Browse Source
This commit is contained in:
Brad King 2025-01-23 14:40:40 -05:00
parent cf44774fd0
commit 482b7c358b
7 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/docker/debian12-x86_64/Dockerfile
View File

@ -44,6 +44,8 @@ RUN --mount=type=bind,source=install_rvm.sh,target=/root/install_rvm.sh \
FROM ${BASE_IMAGE}
LABEL maintainer="Ben Boeckel <ben.boeckel@kitware.com>"
ENV RBENV_ROOT=/opt/rbenv
RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \
--mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \
--mount=type=bind,source=dpkg-exclude,target=/etc/dpkg/dpkg.cfg.d/exclude \

1
.gitlab/ci/docker/debian12-x86_64/deps_packages.lst
View File

@ -102,6 +102,7 @@ libxslt-dev xsltproc
openjdk-17-jdk
python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv
qtbase5-dev qtbase5-dev-tools
rbenv ruby-build
ruby ruby-dev
swig
unixodbc-dev

4
.gitlab/ci/docker/debian12-x86_64/install_deps.sh
View File

@ -10,6 +10,10 @@ sha256sum --check ironpython.sha256sum
dpkg -i ironpython_3.4.0.deb
rm ironpython_3.4.0.deb ironpython.sha256sum
# Ruby rbenv
rbenv install 3.1.2
rbenv global 3.1.2
# Perforce
curl -L https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -o - \
| tar -C /usr/local/bin -xvzf - -- p4 p4d

2
.gitlab/ci/docker/fedora41/Dockerfile
View File

@ -54,6 +54,8 @@ RUN --mount=type=bind,source=install_iwyu.sh,target=/root/install_iwyu.sh \
FROM ${BASE_IMAGE}
LABEL maintainer="Ben Boeckel <ben.boeckel@kitware.com>"
ENV RBENV_ROOT=/opt/rbenv
RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \
--mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \
--mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \

1
.gitlab/ci/docker/fedora41/deps_packages.lst
View File

@ -111,6 +111,7 @@ pypy2 pypy2-devel
pypy3 pypy3-devel
python3 python3-devel python3-numpy
python3-jsmin python3-jsonschema
rbenv ruby-build-rbenv
ruby rubygems ruby-devel
SDL-devel
sqlite-devel

4
.gitlab/ci/docker/fedora41/install_deps.sh
View File

@ -17,6 +17,10 @@ done
# Remove some other packages tests
find /usr/lib64/python3.13/site-packages/breezy -type d -a -name tests -exec rm -rf {} +
# Ruby rbenv
rbenv install 3.1.2
rbenv global 3.1.2
# Perforce
curl -L https://www.perforce.com/downloads/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz -o - \
| tar -C /usr/local/bin -xvzf - -- p4 p4d

4
.gitlab/os-linux.yml
View File

@ -41,7 +41,7 @@
### Debian
.debian12:
image: "kitware/cmake:ci-debian12-x86_64-2024-08-27"
image: "kitware/cmake:ci-debian12-x86_64-2025-01-23"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@ -65,7 +65,7 @@
### Fedora
.fedora41:
image: "kitware/cmake:ci-fedora41-x86_64-2025-01-21"
image: "kitware/cmake:ci-fedora41-x86_64-2025-01-23"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"