From acfe5229930e7672f405af88598bc1acde539b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 26 Nov 2021 08:10:07 +0100 Subject: [PATCH] attempt to fix nur-combined --- ci/nur/path.py | 1 + ci/update-nur.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/nur/path.py b/ci/nur/path.py index 260f0d795..c6649f0e5 100644 --- a/ci/nur/path.py +++ b/ci/nur/path.py @@ -26,6 +26,7 @@ def _find_root() -> Path: return new_root else: raise NurError("NUR repository not found in current directory") + root = new_root ROOT = _find_root() diff --git a/ci/update-nur.sh b/ci/update-nur.sh index b94344817..9a166e78a 100755 --- a/ci/update-nur.sh +++ b/ci/update-nur.sh @@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" source ${DIR}/lib/setup-git.sh set -x -nix run ${DIR}# -- update +nix run "${DIR}#" -- update cd ${DIR}/.. @@ -17,6 +17,8 @@ git clone \ --single-branch \ "https://$API_TOKEN_GITHUB@github.com/nix-community/nur-combined.git" +nix run "${DIR}#" -- combine nur-combined + if [[ -z "$(git diff --exit-code)" ]]; then echo "No changes to the output on this push; exiting." else