Skip to content
Snippets Groups Projects
Commit 1cff4fdf authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira
Browse files

Merge branch 'fix-git' into 'master'

[ci] Fixing git issue

See merge request !288
parents ecacef17 25c1a4c5
No related branches found
No related tags found
1 merge request!288[ci] Fixing git issue
Pipeline #60405 passed
...@@ -6,7 +6,7 @@ variables: ...@@ -6,7 +6,7 @@ variables:
before_script: 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 - python3 ./bob/devtools/bootstrap.py -vv build
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base - conda activate base
......
...@@ -29,7 +29,7 @@ stages: ...@@ -29,7 +29,7 @@ stages:
- python3 bootstrap.py -vv channel base - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base - 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 - conda clean --all
cache: cache:
paths: paths:
......
...@@ -22,7 +22,7 @@ stages: ...@@ -22,7 +22,7 @@ stages:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - 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 activate base
- conda clean --all - conda clean --all
cache: cache:
......
...@@ -25,7 +25,7 @@ stages: ...@@ -25,7 +25,7 @@ stages:
- python3 bootstrap.py -vv channel base - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
# for conda inspect during builds (on macos) # 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 - conda activate base
- bdt ci check -vv - bdt ci check -vv
- conda clean --all - conda clean --all
......
...@@ -27,7 +27,7 @@ build: ...@@ -27,7 +27,7 @@ build:
- docker - docker
stage: build stage: build
before_script: 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 - pip install twine pre-commit sphinx sphinx-rtd-theme
script: script:
- "[ -r .pre-commit-config.yaml ] && pre-commit run --all-files --show-diff-on-failure --verbose" - "[ -r .pre-commit-config.yaml ] && pre-commit run --all-files --show-diff-on-failure --verbose"
......
...@@ -26,7 +26,7 @@ stages: ...@@ -26,7 +26,7 @@ stages:
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
# for conda inspect during builds (on macos) # for conda inspect during builds (on macos)
- conda activate base - 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 - bdt ci check -vv
- conda clean --all - conda clean --all
cache: cache:
......
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