Merge pull request #407 from nix-community/ci

attempt to fix nur-combined
This commit is contained in:
Jörg Thalheim 2021-11-26 07:24:54 +00:00 committed by GitHub
commit c0b70cd36a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View file

@ -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()

View file

@ -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