Skip to content
Snippets Groups Projects
Commit 65007893 authored by Grégoire Kubler's avatar Grégoire Kubler
Browse files

fix : created a before_script fore "retrieve_artifacts"

parent 92948803
No related branches found
No related tags found
1 merge request!8multiple fixes
...@@ -20,11 +20,17 @@ include: ...@@ -20,11 +20,17 @@ include:
# NOTE: # NOTE:
# For this script to work the var DEPENDENCY_JOB must be defined ; # 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. # - DEPENDENCY_JOB: the name of the specific job that will serve as reference.
script: before_script :
- set -x - set -x
- !reference [.ubuntu:download:setup, script] - !reference [.ubuntu:download:setup, script]
- !reference [.ubuntu:download:list_dependencies, script] - !reference [.ubuntu:download:list_dependencies, script]
- !reference [.ubuntu:download:select_jobs, 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[@] - echo $DEPS_NAMES[@]
- set +x - set +x
- echo "Retrieving artifacts of selected jobs." - echo "Retrieving artifacts of selected jobs."
......
include: include:
- local: '/.gitlab/ci/default.gitlab-ci.yml' - local: '/.gitlab/ci/default.gitlab-ci.yml'
# Static analysis job
- local: '/.gitlab/ci/static_analysis/cpp.gitlab-ci.yml' - local: '/.gitlab/ci/static_analysis/cpp.gitlab-ci.yml'
#################################################################################################### ####################################################################################################
...@@ -24,7 +23,7 @@ include: ...@@ -24,7 +23,7 @@ include:
- !reference [.retrieve_deps:apt, script] - !reference [.retrieve_deps:apt, script]
- DEPENDENCY_JOB="$CI_JOB_NAME" - 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 # Build current module
- export CMAKE_PREFIX_PATH=$AIDGE_INSTALL - export CMAKE_PREFIX_PATH=$AIDGE_INSTALL
- echo "Build directory :$BUILD_DIR" - echo "Build directory :$BUILD_DIR"
......
include: include:
- local: '/.gitlab/ci/default.gitlab-ci.yml' - local: '/.gitlab/ci/default.gitlab-ci.yml'
# Static analysis job
- local: '/.gitlab/ci/static_analysis/python.gitlab-ci.yml' - local: '/.gitlab/ci/static_analysis/python.gitlab-ci.yml'
#################################################################################################### ####################################################################################################
...@@ -16,7 +15,7 @@ build:ubuntu_python: ...@@ -16,7 +15,7 @@ build:ubuntu_python:
- apt-get install -qq -y cmake python-is-python3 pip - apt-get install -qq -y cmake python-is-python3 pip
- !reference [.retrieve_deps:apt, script] - !reference [.retrieve_deps:apt, script]
- DEPENDENCY_JOB="build:ubuntu_python" - DEPENDENCY_JOB="build:ubuntu_python"
- !reference [.ubuntu:download:artifacts, script] - !reference [.ubuntu:download:artifacts, before_script]
- python3 -m pip install virtualenv - python3 -m pip install virtualenv
script: script:
......
...@@ -25,7 +25,7 @@ build:windows_cpp: ...@@ -25,7 +25,7 @@ build:windows_cpp:
- $env:CMAKE_PREFIX_PATH = $env:AIDGE_INSTALL - $env:CMAKE_PREFIX_PATH = $env:AIDGE_INSTALL
# Download dependencies if required # Download dependencies if required
- $DEPENDENCY_JOB="build:windows_cpp" - $DEPENDENCY_JOB="build:windows_cpp"
- !reference [.windows:download:artifacts, script] # located in common.gitlab-ci.yml - !reference [.windows:download:artifacts, before_script]
script: script:
- Write-Host "Build directory :$env:BUILD_DIR" - Write-Host "Build directory :$env:BUILD_DIR"
......
...@@ -24,7 +24,7 @@ build:windows_python: ...@@ -24,7 +24,7 @@ build:windows_python:
- $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
# Download artifacts # Download artifacts
- $DEPENDENCY_JOB="build:windows_python" - $DEPENDENCY_JOB="build:windows_python"
- !reference [.windows:download:artifacts, script] # located in common.gitlab-ci.yml - !reference [.windows:download:artifacts, before_script]
script: script:
- python -m pip install virtualenv - python -m pip install virtualenv
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment