Compare commits

...

2 commits

2 changed files with 4 additions and 2 deletions

View file

@ -64,10 +64,10 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1721397579,
"lastModified": 1721409873,
"narHash": "sha256-h0njWQRvtkjK0NJ/Kgj76sXBhWwq5HGJm7OMcigmNw4=",
"ref": "refs/heads/refactor",
"rev": "c49e591ae59b5d01d3f5d8e59310244dd5da7446",
"rev": "54bba654d4279dfd112345b6470547851feb1457",
"revCount": 267,
"type": "git",
"url": "https://git.lix.systems/lix-project/buildbot-nix.git"

View file

@ -30,6 +30,8 @@ let
cd ${cfg.workingDir}/${name}
git pull origin ${fromRefspec}
EXPECTED_REF=$(git rev-list ${localRefspec} | head -1)
git config user.name Fork-o-Tron
git config user.email noreply@forkos.org
git fetch ${fromUri} ${fromRefspec}
git merge FETCH_HEAD
GIT_SSH_COMMAND='ssh -i ${cfg.deployKeyPath}' git push ${cfg.pushUrl} HEAD:${targetRef}