From 650078931fc071d43c7588de0655b2299c6ac6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire?= <gregoire.kubler@proton.me>
Date: Tue, 23 Jul 2024 17:32:13 +0200
Subject: [PATCH] fix : created a before_script fore "retrieve_artifacts"
---
.gitlab/ci/download/download.gitlab-ci.yml | 8 +++++++-
.gitlab/ci/ubuntu_cpp.gitlab-ci.yml | 3 +--
.gitlab/ci/ubuntu_python.gitlab-ci.yml | 3 +--
.gitlab/ci/windows_cpp.gitlab-ci.yml | 2 +-
.gitlab/ci/windows_python.gitlab-ci.yml | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitlab/ci/download/download.gitlab-ci.yml b/.gitlab/ci/download/download.gitlab-ci.yml
index 3490813..90ce0e1 100644
--- a/.gitlab/ci/download/download.gitlab-ci.yml
+++ b/.gitlab/ci/download/download.gitlab-ci.yml
@@ -20,11 +20,17 @@ include:
# NOTE:
# For this script to work the var DEPENDENCY_JOB must be defined ;
# - DEPENDENCY_JOB: the name of the specific job that will serve as reference.
- script:
+ before_script :
- set -x
- !reference [.ubuntu:download:setup, script]
- !reference [.ubuntu:download:list_dependencies, script]
- !reference [.ubuntu:download:select_jobs, script]
+ - !reference [.ubuntu:download:artifacts, script]
+ - set +x
+
+ script:
+ - set -x
+ - !reference [.ubuntu:download:setup, script] # sometimes only the script must be called & not the before_script hence setup must be here.
- echo $DEPS_NAMES[@]
- set +x
- echo "Retrieving artifacts of selected jobs."
diff --git a/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml b/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml
index c135dea..5205ef3 100644
--- a/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml
+++ b/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml
@@ -1,6 +1,5 @@
include:
- local: '/.gitlab/ci/default.gitlab-ci.yml'
- #Â Static analysis job
- local: '/.gitlab/ci/static_analysis/cpp.gitlab-ci.yml'
####################################################################################################
@@ -24,7 +23,7 @@ include:
- !reference [.retrieve_deps:apt, script]
- DEPENDENCY_JOB="$CI_JOB_NAME"
- - !reference [.ubuntu:download:artifacts, script] # located in common.gitlab-ci.yml
+ - !reference [.ubuntu:download:artifacts, before_script]
# Build current module
- export CMAKE_PREFIX_PATH=$AIDGE_INSTALL
- echo "Build directory :$BUILD_DIR"
diff --git a/.gitlab/ci/ubuntu_python.gitlab-ci.yml b/.gitlab/ci/ubuntu_python.gitlab-ci.yml
index e881c3f..ea32ffb 100644
--- a/.gitlab/ci/ubuntu_python.gitlab-ci.yml
+++ b/.gitlab/ci/ubuntu_python.gitlab-ci.yml
@@ -1,6 +1,5 @@
include:
- local: '/.gitlab/ci/default.gitlab-ci.yml'
- #Â Static analysis job
- local: '/.gitlab/ci/static_analysis/python.gitlab-ci.yml'
####################################################################################################
@@ -16,7 +15,7 @@ build:ubuntu_python:
- apt-get install -qq -y cmake python-is-python3 pip
- !reference [.retrieve_deps:apt, script]
- DEPENDENCY_JOB="build:ubuntu_python"
- - !reference [.ubuntu:download:artifacts, script]
+ - !reference [.ubuntu:download:artifacts, before_script]
- python3 -m pip install virtualenv
script:
diff --git a/.gitlab/ci/windows_cpp.gitlab-ci.yml b/.gitlab/ci/windows_cpp.gitlab-ci.yml
index 81c075a..2a46faf 100644
--- a/.gitlab/ci/windows_cpp.gitlab-ci.yml
+++ b/.gitlab/ci/windows_cpp.gitlab-ci.yml
@@ -25,7 +25,7 @@ build:windows_cpp:
- $env:CMAKE_PREFIX_PATH = $env:AIDGE_INSTALL
# Download dependencies if required
- $DEPENDENCY_JOB="build:windows_cpp"
- - !reference [.windows:download:artifacts, script] # located in common.gitlab-ci.yml
+ - !reference [.windows:download:artifacts, before_script]
script:
- Write-Host "Build directory :$env:BUILD_DIR"
diff --git a/.gitlab/ci/windows_python.gitlab-ci.yml b/.gitlab/ci/windows_python.gitlab-ci.yml
index 2302b79..a98ebbb 100644
--- a/.gitlab/ci/windows_python.gitlab-ci.yml
+++ b/.gitlab/ci/windows_python.gitlab-ci.yml
@@ -24,7 +24,7 @@ build:windows_python:
- $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
# Download artifacts
- $DEPENDENCY_JOB="build:windows_python"
- - !reference [.windows:download:artifacts, script] # located in common.gitlab-ci.yml
+ - !reference [.windows:download:artifacts, before_script]
script:
- python -m pip install virtualenv
--
GitLab