diff --git a/ci-tools/update-nixpkgs b/ci-tools/update-nixpkgs index 370184e720fd1c07f750bf34daf39bcaf5f854d9..246e185ad74d5dda4ee62b8a4fbed01d90e1042a 100755 --- a/ci-tools/update-nixpkgs +++ b/ci-tools/update-nixpkgs @@ -39,7 +39,7 @@ setup_git export TARGET_BRANCH="nixpkgs-upgrade-$(date +%Y-%m-%d)" echo '{}' > morph/grid/local/public-keys/users.nix -# nix-build -A morph -o result-before +nix-build -A morph -o result-before git branch -D "${TARGET_BRANCH}" || true git checkout -b "${TARGET_BRANCH}" @@ -57,9 +57,8 @@ if git diff --exit-code origin/develop...; then exit 0 fi -# nix-build -A morph -o result-after -# DIFF=$(nix --extra-experimental-features nix-command store diff-closures ./result-before/ ./result-after/) -DIFF="Hello world" +nix-build -A morph -o result-after +DIFF=$(nix --extra-experimental-features nix-command store diff-closures ./result-before/ ./result-after/) git commit -am "bump nixpkgs version" git push --force origin "${TARGET_BRANCH}:${TARGET_BRANCH}"