From 25c1a4c53150a7e5da575499d8a627707faf9990 Mon Sep 17 00:00:00 2001 From: Tiago Freitas Pereira <tiagofrepereira@gmail.com> Date: Wed, 20 Apr 2022 15:26:03 +0200 Subject: [PATCH] [ci] Fixing git issue --- .gitlab-ci.yml | 2 +- bob/devtools/data/gitlab-ci/docs.yaml | 2 +- bob/devtools/data/gitlab-ci/nightlies.yaml | 2 +- bob/devtools/data/gitlab-ci/noarch.yaml | 2 +- bob/devtools/data/gitlab-ci/python-package.yaml | 2 +- bob/devtools/data/gitlab-ci/single-package.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04a0e7c6..6f4feaff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: before_script: - - git config --global --add safe.directory ${CI_PROJECT_DIR} + - if [[ $CI_RUNNER_TAGS == *"docker,"* ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi - python3 ./bob/devtools/bootstrap.py -vv build - source ${CONDA_ROOT}/etc/profile.d/conda.sh - conda activate base diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml index 7cac3f2f..75bf044e 100644 --- a/bob/devtools/data/gitlab-ci/docs.yaml +++ b/bob/devtools/data/gitlab-ci/docs.yaml @@ -29,7 +29,7 @@ stages: - python3 bootstrap.py -vv channel base - source ${CONDA_ROOT}/etc/profile.d/conda.sh - conda activate base - - git config --global --add safe.directory ${CI_PROJECT_DIR} + - if [[ $CI_RUNNER_TAGS == *"docker,"* ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi - conda clean --all cache: paths: diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml index 82eff798..a81f6afa 100644 --- a/bob/devtools/data/gitlab-ci/nightlies.yaml +++ b/bob/devtools/data/gitlab-ci/nightlies.yaml @@ -22,7 +22,7 @@ stages: - curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - python3 bootstrap.py -vv channel base - source ${CONDA_ROOT}/etc/profile.d/conda.sh - - git config --global --add safe.directory ${CI_PROJECT_DIR} + - if [[ $CI_RUNNER_TAGS == *"docker,"* ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi - conda activate base - conda clean --all cache: diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml index a3ffb013..c6ca6f5f 100644 --- a/bob/devtools/data/gitlab-ci/noarch.yaml +++ b/bob/devtools/data/gitlab-ci/noarch.yaml @@ -25,7 +25,7 @@ stages: - python3 bootstrap.py -vv channel base - source ${CONDA_ROOT}/etc/profile.d/conda.sh # for conda inspect during builds (on macos) - - git config --global --add safe.directory ${CI_PROJECT_DIR} + - if [[ $CI_RUNNER_TAGS == *"docker,"* ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi - conda activate base - bdt ci check -vv - conda clean --all diff --git a/bob/devtools/data/gitlab-ci/python-package.yaml b/bob/devtools/data/gitlab-ci/python-package.yaml index 3bb9f851..01a0e335 100644 --- a/bob/devtools/data/gitlab-ci/python-package.yaml +++ b/bob/devtools/data/gitlab-ci/python-package.yaml @@ -27,7 +27,7 @@ build: - docker stage: build before_script: - - git config --global --add safe.directory ${CI_PROJECT_DIR} + - if [[ $CI_RUNNER_TAGS == *"docker,"* ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi - pip install twine pre-commit sphinx sphinx-rtd-theme script: - "[ -r .pre-commit-config.yaml ] && pre-commit run --all-files --show-diff-on-failure --verbose" diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml index 34657923..4df03e18 100644 --- a/bob/devtools/data/gitlab-ci/single-package.yaml +++ b/bob/devtools/data/gitlab-ci/single-package.yaml @@ -26,7 +26,7 @@ stages: - source ${CONDA_ROOT}/etc/profile.d/conda.sh # for conda inspect during builds (on macos) - conda activate base - - git config --global --add safe.directory ${CI_PROJECT_DIR} + - if [[ $CI_RUNNER_TAGS == *"docker,"* ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi - bdt ci check -vv - conda clean --all cache: -- GitLab