diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8e0ec40d5713558942f189172e177cf11d371c9..2805123fca6d9b02f5cff5d973f55c5de663d8ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,11 @@ workflow: .build: stage: build script: + # Install prerequisite for git-gui and gitk + - env | grep -i proxy + - cat /etc/yum.conf + - sudo yum -y update + - sudo yum -y install tcl-devel tk-devel # Install recent version of python required to build meson that is a requirement for building chain of git - curl -s -L -o python.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/${PYTHON_VERSION}/download?job=${PLATFORM} - unzip -q python.zip @@ -25,9 +30,6 @@ workflow: - python --version | grep ${PYTHON_VERSION} - python -m pip install --upgrade pip - python -m pip install conan - # Install prerequisite for git-gui and gitk - - sudo yum -y update - - sudo yum -y install tcl-devel tk-devel # Build git with conan - conan profile detect --force - conan create . --version ${GIT_VERSION} -s compiler.libcxx=libstdc++11 --build="*"