From e4db01b245aa4dcaba4499219036834ce7a28124 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Thu, 14 Apr 2022 11:23:06 +0200
Subject: [PATCH] Applying the security [git] fix from 285
---
bob/devtools/data/gitlab-ci/docs.yaml | 1 +
bob/devtools/data/gitlab-ci/nightlies.yaml | 1 +
bob/devtools/data/gitlab-ci/noarch.yaml | 1 +
bob/devtools/data/gitlab-ci/python-package.yaml | 1 +
bob/devtools/data/gitlab-ci/single-package.yaml | 1 +
5 files changed, 5 insertions(+)
diff --git a/bob/devtools/data/gitlab-ci/docs.yaml b/bob/devtools/data/gitlab-ci/docs.yaml
index 15770377..7cac3f2f 100644
--- a/bob/devtools/data/gitlab-ci/docs.yaml
+++ b/bob/devtools/data/gitlab-ci/docs.yaml
@@ -29,6 +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}
- conda clean --all
cache:
paths:
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index e0c268ec..82eff798 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -22,6 +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}
- 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 41db1381..a3ffb013 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -25,6 +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}
- 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 f86bb117..3bb9f851 100644
--- a/bob/devtools/data/gitlab-ci/python-package.yaml
+++ b/bob/devtools/data/gitlab-ci/python-package.yaml
@@ -27,6 +27,7 @@ build:
- docker
stage: build
before_script:
+ - git config --global --add safe.directory ${CI_PROJECT_DIR}
- 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 ff4f38cd..34657923 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -26,6 +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}
- bdt ci check -vv
- conda clean --all
cache:
--
GitLab