diff options
| author | coqbot-app[bot] | 2020-09-22 11:16:24 +0000 |
|---|---|---|
| committer | GitHub | 2020-09-22 11:16:24 +0000 |
| commit | c7e72656a2ece7e5244988e2c165e64aad14e871 (patch) | |
| tree | 22db67f50b7f7038b062a2b0c39ac41ef48a4307 | |
| parent | 5a9538ed71cdcbbed6f8422b66070f0a987b5f59 (diff) | |
| parent | 73db4e3dd8146f605bc1d823cf61a6c5d80e41dd (diff) | |
Merge PR #13050: [ci/gitlab/cachix] Avoid running in trouble when calling git fetch --unshallow
Reviewed-by: SkySkimmer
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d22be71a1..a3f6eab1a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -465,6 +465,8 @@ pkg:nix:deploy:channel: - pkg:nix:deploy script: - echo "$CACHIX_DEPLOYMENT_KEY" | tr -d '\r' | ssh-add - > /dev/null + # Remove all pr branches because they could be missing when we run git fetch --unshallow + - git branch --list 'pr-*' | xargs -r git branch -d - git fetch --unshallow - git branch -v - git push git@github.com:coq/coq-on-cachix "${CI_COMMIT_SHA}":"refs/heads/${CI_COMMIT_REF_NAME}" |