From 12a7ecdfa19848a92343a432034103992d8bf495 Mon Sep 17 00:00:00 2001
From: Jean-Matthieu Etancelin <jean-matthieu.etancelin@univ-pau.fr>
Date: Mon, 1 Jul 2024 11:27:06 +0200
Subject: [PATCH] build all docker images with default tag
---
.gitlab-ci.yml | 6 +++---
ci/docker_images/ubuntu_jammy_meson/Dockerfile | 1 -
docs/hysop-doc | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c0b790af..12273ddd7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ ubuntu:jammy-meson:docker-build:
- lmap
- cpu
rules:
- - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-jammy-meson\]/
+ - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-jammy-meson\]/ || $CI_COMMIT_MESSAGE =~ /\[docker-build-all\]/
when: always
ubuntu:nvidia-meson:docker-build:
@@ -54,7 +54,7 @@ ubuntu:nvidia-meson:docker-build:
- lmap
- cpu
rules:
- - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-nvidia\]/
+ - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-nvidia\]/ || $CI_COMMIT_MESSAGE =~ /\[docker-build-all\]/
when: always
mamba-meson:docker-build:
@@ -66,7 +66,7 @@ mamba-meson:docker-build:
- lmap
- cpu
rules:
- - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-mamba\]/
+ - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-mamba\]/ || $CI_COMMIT_MESSAGE =~ /\[docker-build-all\]/
when: always
## -- hysop jobs --
diff --git a/ci/docker_images/ubuntu_jammy_meson/Dockerfile b/ci/docker_images/ubuntu_jammy_meson/Dockerfile
index e82ffee11..9c9729c6f 100644
--- a/ci/docker_images/ubuntu_jammy_meson/Dockerfile
+++ b/ci/docker_images/ubuntu_jammy_meson/Dockerfile
@@ -260,7 +260,6 @@ ENV PYOPENCL_COMPILER_OUTPUT=1
# january 2024: h5py doesn't compile with cython==3.x.x!
# january 2024: pyfftw doesn't compile with cython==3.x.x!
RUN pip install --upgrade cython==3.0.8
-RUN pip uninstall -y setuptools
RUN pip install numpy==1.26.3
diff --git a/docs/hysop-doc b/docs/hysop-doc
index 608d0e5f3..3c3338e35 160000
--- a/docs/hysop-doc
+++ b/docs/hysop-doc
@@ -1 +1 @@
-Subproject commit 608d0e5f37dba68086e534c78e2224d9916c0e35
+Subproject commit 3c3338e354c53b948bba7eb3e343fc475751698b
--
GitLab