From 73db4e3dd8146f605bc1d823cf61a6c5d80e41dd Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Thu, 17 Sep 2020 18:28:23 +0200
Subject: [ci/gitlab/cachix] Avoid running in trouble when calling git fetch
 --unshallow.

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16f82a19ee..afed5c4f07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -451,6 +451,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}"
-- 
cgit v1.2.3