ci: Update base images to Debian 12

This commit is contained in:
Brad King
2023-07-27 13:11:18 -04:00
parent e49ff2b2f2
commit 9526679bbc
15 changed files with 39 additions and 39 deletions

View File

@@ -1,15 +0,0 @@
#!/bin/sh
set -e
apt-get install -y $(grep '^[^#]\+$' /root/deps_packages.lst)
curl -L -O https://github.com/IronLanguages/ironpython2/releases/download/ipy-2.7.10/ironpython_2.7.10.deb
echo 'e1aceec1d49ffa66e9059a52168a734999dcccc50164a60e2936649cae698f3e ironpython_2.7.10.deb' > ironpython.sha256sum
sha256sum --check ironpython.sha256sum
dpkg -i ironpython_2.7.10.deb
rm ironpython_2.7.10.deb ironpython.sha256sum
# 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

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE=arm64v8/debian:10
ARG BASE_IMAGE=arm64v8/debian:12
FROM ${BASE_IMAGE} AS apt-cache
# Populate APT cache w/ the fresh metadata and prefetch packages.

View File

@@ -20,14 +20,14 @@ libzstd-dev
zlib1g-dev
# Install iwyu runtime deps.
clang-6.0
clang-15
libncurses6
# Tools needed for the test suite.
jq
# Packages needed to test CTest.
bzr bzr-xmloutput
bzr
cvs
subversion
mercurial
@@ -73,20 +73,19 @@ libopenal-dev
libopenmpi-dev openmpi-bin
libosp-dev
libpng-dev
libpq-dev postgresql-server-dev-11
libpq-dev postgresql-server-dev-15
libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc
libsdl-dev
libsdl1.2-dev
libsqlite3-dev
libtiff-dev
libuv1-dev
libwxgtk3.0-dev
libwxgtk3.2-dev
libx11-dev
libxalan-c-dev
libxerces-c-dev
libxml2-dev libxml2-utils
libxslt-dev xsltproc
openjdk-11-jdk
python2 python2-dev python-numpy pypy pypy-dev
openjdk-17-jdk
python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv
qtbase5-dev qtbase5-dev-tools
ruby ruby-dev

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE=debian:10
ARG BASE_IMAGE=debian:12
FROM ${BASE_IMAGE} AS apt-cache
# Populate APT cache w/ the fresh metadata and prefetch packages.
@@ -56,7 +56,7 @@ RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \
RUN --mount=type=bind,from=iwyu-build,source=/root,target=/root \
tar -C / -xf /root/iwyu.tar \
&& ln -s /usr/lib/llvm-6.0/bin/include-what-you-use /usr/bin/include-what-you-use-6.0
&& ln -s /usr/lib/llvm-15/bin/include-what-you-use /usr/bin/include-what-you-use-15
RUN --mount=type=bind,from=rvm-build,source=/root,target=/root \
tar -C /usr/local -xf /root/rvm.tar

View File

@@ -20,18 +20,21 @@ libzstd-dev
zlib1g-dev
# Install iwyu runtime deps.
clang-6.0
clang-15
libncurses6
# Tools needed for the test suite.
jq
# Packages needed to test CTest.
bzr bzr-xmloutput
bzr
cvs
subversion
mercurial
# Install HIP language toolchain.
hipcc
# Install swift runtime deps.
libncurses5
@@ -76,25 +79,24 @@ libopenal-dev
libopenmpi-dev openmpi-bin
libosp-dev
libpng-dev
libpq-dev postgresql-server-dev-11
libpq-dev postgresql-server-dev-15
libprotobuf-dev libprotobuf-c-dev libprotoc-dev protobuf-compiler protobuf-compiler-grpc
libsdl-dev
libsdl1.2-dev
libsqlite3-dev
libtiff-dev
libuv1-dev
libwxgtk3.0-dev
libwxgtk3.2-dev
libx11-dev
libxalan-c-dev
libxerces-c-dev
libxml2-dev libxml2-utils
libxslt-dev xsltproc
openjdk-11-jdk
python2 python2-dev python-numpy pypy pypy-dev
openjdk-17-jdk
python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv
qtbase5-dev qtbase5-dev-tools
ruby ruby-dev
swig
unixodbc-dev
# CMake_TEST_FindPython2_IronPython
# Packages needed to test ironpython.
libmono-system-windows-forms4.0-cil

View File

@@ -0,0 +1,15 @@
#!/bin/sh
set -e
apt-get install -y $(grep '^[^#]\+$' /root/deps_packages.lst)
curl -L -O https://github.com/IronLanguages/ironpython3/releases/download/v3.4.0/ironpython_3.4.0.deb
echo '7dcd10b7a0ec0342bd7e20eebb597a96bb15267eb797d59358a3b1cfaa3e1adc ironpython_3.4.0.deb' > ironpython.sha256sum
sha256sum --check ironpython.sha256sum
dpkg -i ironpython_3.4.0.deb
rm ironpython_3.4.0.deb ironpython.sha256sum
# 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

View File

@@ -8,7 +8,7 @@ apt-get install -y $(grep '^[^#]\+$' /root/iwyu_packages.lst)
cd /root
git clone "https://github.com/include-what-you-use/include-what-you-use.git"
cd include-what-you-use
readonly llvm_version="$( clang-6.0 --version | head -n1 | cut -d' ' -f3 | cut -d. -f-2 )"
readonly llvm_version="$( clang-15 --version | head -n1 | cut -d' ' -f4 | cut -d. -f-1 )"
git checkout "clang_$llvm_version"
mkdir build
cd build
@@ -16,7 +16,6 @@ cd build
cmake -GNinja \
-DCMAKE_BUILD_TYPE=Release \
"-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$llvm_version" \
"-DIWYU_LLVM_ROOT_PATH=/usr/lib/llvm-$llvm_version" \
..
ninja
DESTDIR=/root/iwyu-destdir ninja install

View File

@@ -11,7 +11,7 @@ gpg2 --keyserver hkps://keyserver.ubuntu.com \
curl -sSL https://get.rvm.io | bash -s stable
# keep version in sync with `env_debian*_ninja.sh`
/usr/local/rvm/bin/rvm install ruby-2.7.0
/usr/local/rvm/bin/rvm install ruby-3.2.2
for p in archives examples gem-cache log src; do
touch /usr/local/rvm/${p}/.tar_exclude

View File

@@ -1,7 +1,7 @@
# Install development tools.
clang-6.0
libclang-6.0-dev
llvm-6.0-dev
clang-15
libclang-15-dev
llvm-15-dev
libz-dev
g++
cmake