From 78d0613695c76609f5889660e1bc51cbbd4480d7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 16 Mar 2022 13:49:03 -0400 Subject: ci: Drop p4 binary checksum because the download URL is not stable In commit f9526f39a1 (ci: Add bzr and p4 to Debian and Fedora base images, 2022-02-21) we checked the SHA-256 hash of the Perforce binary. However, content at the download URL has changed in just the last few weeks, so we cannot consider it stable. --- .gitlab/ci/docker/debian10/install_deps.sh | 4 +--- .gitlab/ci/docker/fedora35/install_deps.sh | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index 1c112dd..0e5dcad 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.gitlab/ci/docker/debian10/install_deps.sh @@ -98,9 +98,7 @@ rm ironpython_2.7.10.deb ironpython.sha256sum # 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 helix.sha256sum +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 038000c..8d636cf 100755 --- a/.gitlab/ci/docker/fedora35/install_deps.sh +++ b/.gitlab/ci/docker/fedora35/install_deps.sh @@ -110,7 +110,5 @@ 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 -- cgit v0.12 From 97f4aa1f050a6a03e2bb2c1abe5fce49c13e7252 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 16 Mar 2022 13:51:39 -0400 Subject: ci: Add OpenJDK to Debian and Fedora base images This enables the `JavaExportImport` test in CI. --- .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 1 + .gitlab/ci/docker/debian10/install_deps.sh | 1 + .gitlab/ci/docker/fedora35/install_deps.sh | 1 + .gitlab/os-linux.yml | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh index 21f0b16..6e9aa0f 100755 --- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh +++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh @@ -76,6 +76,7 @@ apt-get install -y \ libxerces-c-dev \ libxml2-dev libxml2-utils \ libxslt-dev xsltproc \ + openjdk-11-jdk \ python2 python2-dev python-numpy pypy pypy-dev \ python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv \ qtbase5-dev qtbase5-dev-tools \ diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index 0e5dcad..f858037 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.gitlab/ci/docker/debian10/install_deps.sh @@ -80,6 +80,7 @@ apt-get install -y \ libxerces-c-dev \ libxml2-dev libxml2-utils \ libxslt-dev xsltproc \ + openjdk-11-jdk \ python2 python2-dev python-numpy pypy pypy-dev \ python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv \ qtbase5-dev qtbase5-dev-tools \ diff --git a/.gitlab/ci/docker/fedora35/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh index 8d636cf..3cc5ed5 100755 --- a/.gitlab/ci/docker/fedora35/install_deps.sh +++ b/.gitlab/ci/docker/fedora35/install_deps.sh @@ -69,6 +69,7 @@ dnf install --setopt=install_weak_deps=False -y \ gsl-devel \ gtest-devel \ gtk2-devel \ + java-11-openjdk-devel \ jsoncpp-devel \ lapack-devel \ libarchive-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 30b4fc3..4f0fda4 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -45,7 +45,7 @@ ### Debian .debian10: - image: "kitware/cmake:ci-debian10-x86_64-2022-02-25" + image: "kitware/cmake:ci-debian10-x86_64-2022-03-16" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -60,7 +60,7 @@ CMAKE_CI_NO_INSTALL: 1 .debian10_aarch64: - image: "kitware/cmake:ci-debian10-aarch64-2022-02-21" + image: "kitware/cmake:ci-debian10-aarch64-2022-03-16" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -69,7 +69,7 @@ ### Fedora .fedora35: - image: "kitware/cmake:ci-fedora35-x86_64-2022-02-21" + image: "kitware/cmake:ci-fedora35-x86_64-2022-03-16" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" -- cgit v0.12