From 1faa3ba150a56b6db07bb2b2c89590a488d5a083 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Thu, 16 Mar 2023 22:36:53 +0100 Subject: [PATCH] Force to use image with Conan 1 because all required packages for building Python are not yet for Conan 2 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5388f7..2f7654d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,14 +44,14 @@ workflow: linux-x86_64: extends: [".build"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:1.59.0 variables: NAME: "python-${PYTHON_VERSION}-linux-x86_64" PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}" test-x86_64: extends: [".test"] - image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91 + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:1.59.0 variables: NAME: "python-${PYTHON_VERSION}-linux-x86_64" needs: -- GitLab