From 7ccd6abcf0ca890cb1fd262c43702e555741cdd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Gounon?= <aurelien.gounon@cern.ch>
Date: Fri, 4 Feb 2022 10:02:26 +0100
Subject: [PATCH] consider lightweight tags for the xroot-ssi version while
building
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57e45dab03..be89ce3df2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ cta_rpm:
- yum -y install yum-plugin-priorities yum-plugin-versionlock
- yum install -y git
- git submodule update --init --recursive
- - cd xrootd-ssi-protobuf-interface && export XROOTD_SSI_PROTOBUF_INTERFACE_VERSION=$(git describe --abbrev=0) && cd ..
+ - cd xrootd-ssi-protobuf-interface && export XROOTD_SSI_PROTOBUF_INTERFACE_VERSION=$(git describe --tags --abbrev=0) && cd ..
- cp -f continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
- yum-builddep --nogpgcheck -y build_srpm/RPM/SRPMS/*
- mkdir build_rpm
@@ -78,7 +78,7 @@ cta_tagged_rpm:
- yum -y install yum-plugin-priorities yum-plugin-versionlock
- yum install -y git
- git submodule update --init --recursive
- - cd xrootd-ssi-protobuf-interface && export XROOTD_SSI_PROTOBUF_INTERFACE_VERSION=$(git describe --abbrev=0) && cd ..
+ - cd xrootd-ssi-protobuf-interface && export XROOTD_SSI_PROTOBUF_INTERFACE_VERSION=$(git describe --tags --abbrev=0) && cd ..
- cp -f continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/
- yum-builddep --nogpgcheck -y build_srpm/RPM/SRPMS/*
- mkdir build_tagged_rpm
--
GitLab