From 5df82248f01da329a6d29a86a54dde6e5eebf66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Mar 2020 17:26:24 +0000 Subject: [PATCH] ci: try to fix update by pulling first --- ci/update-nur.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/update-nur.sh b/ci/update-nur.sh index fd85b9aa0..10b47c781 100755 --- a/ci/update-nur.sh +++ b/ci/update-nur.sh @@ -21,7 +21,8 @@ if [[ -z "$(git diff --exit-code)" ]]; then else git add --all repos.json* git commit -m "automatic update" - git push git@github.com:nix-community/NUR HEAD:master + git pull origin master + git push git@github.com:nix-community/NUR master fi (cd nur-combined && git push origin master)