From b3e66e880871ae6eebf55dfc6bea14b2ec862af8 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Wed, 7 Feb 2024 11:15:05 +0100
Subject: [PATCH] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8e0ec4..2805123 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="*"
--
GitLab