From 19e0c985eeb6e7af9b26523589b45398c4528f8c Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 13 Jul 2022 21:02:41 -0400 Subject: [PATCH] turn on builds and diff calculation --- ci-tools/update-nixpkgs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci-tools/update-nixpkgs b/ci-tools/update-nixpkgs index 370184e7..246e185a 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}" -- GitLab