Skip to content
Snippets Groups Projects
Commit 66741010 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

try to have the develop ref

parent b1cb79e6
No related branches found
No related tags found
2 merge requests!319update production,!305Automate updating nixpkgs pin in develop branch once a week
Pipeline #2358 passed
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment