diff --git a/ci-tools/update-nixpkgs b/ci-tools/update-nixpkgs index f4d9c40d0d088e48399d16f2a448990b79337092..baac52846cc300c9dc85f27134d35e44693a5d67 100755 --- a/ci-tools/update-nixpkgs +++ b/ci-tools/update-nixpkgs @@ -40,9 +40,10 @@ export SOURCE_BRANCH="nixpkgs-upgrade-$(date +%Y-%m-%d)" # Avoid messing with the checkout we're running from. git clone . working-copy cd working-copy +git remote add upstream gitlab@whetstone.private.storage:PrivateStorage/PrivateStorageio.git +git fetch upstream develop git branch -D "${SOURCE_BRANCH}" || true -git fetch origin develop -git checkout -B "${SOURCE_BRANCH}" origin/develop +git checkout -B "${SOURCE_BRANCH}" upstream/develop echo '{}' > morph/grid/local/public-keys/users.nix nix-build -A morph -o result-before @@ -61,7 +62,7 @@ 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 "${SOURCE_BRANCH}:${SOURCE_BRANCH}" +git push --force upstream "${SOURCE_BRANCH}:${SOURCE_BRANCH}" BODY=$(python3 -c ' import os, sys, json