From 667410100cb828228a361235330e4600540ea0ac Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 14 Jul 2022 18:46:35 -0400
Subject: [PATCH] try to have the develop ref
---
ci-tools/update-nixpkgs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ci-tools/update-nixpkgs b/ci-tools/update-nixpkgs
index f4d9c40d..baac5284 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
--
GitLab