forked from the-distro/infra
Compare commits
2 commits
3180952b37
...
6f7675fa22
Author | SHA1 | Date | |
---|---|---|---|
Yureka | 6f7675fa22 | ||
Yureka | 437fc2394a |
|
@ -64,10 +64,10 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721397579,
|
"lastModified": 1721409873,
|
||||||
"narHash": "sha256-h0njWQRvtkjK0NJ/Kgj76sXBhWwq5HGJm7OMcigmNw4=",
|
"narHash": "sha256-h0njWQRvtkjK0NJ/Kgj76sXBhWwq5HGJm7OMcigmNw4=",
|
||||||
"ref": "refs/heads/refactor",
|
"ref": "refs/heads/refactor",
|
||||||
"rev": "c49e591ae59b5d01d3f5d8e59310244dd5da7446",
|
"rev": "54bba654d4279dfd112345b6470547851feb1457",
|
||||||
"revCount": 267,
|
"revCount": 267,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.lix.systems/lix-project/buildbot-nix.git"
|
"url": "https://git.lix.systems/lix-project/buildbot-nix.git"
|
||||||
|
|
|
@ -30,6 +30,8 @@ let
|
||||||
cd ${cfg.workingDir}/${name}
|
cd ${cfg.workingDir}/${name}
|
||||||
git pull origin ${fromRefspec}
|
git pull origin ${fromRefspec}
|
||||||
EXPECTED_REF=$(git rev-list ${localRefspec} | head -1)
|
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 fetch ${fromUri} ${fromRefspec}
|
||||||
git merge FETCH_HEAD
|
git merge FETCH_HEAD
|
||||||
GIT_SSH_COMMAND='ssh -i ${cfg.deployKeyPath}' git push ${cfg.pushUrl} HEAD:${targetRef}
|
GIT_SSH_COMMAND='ssh -i ${cfg.deployKeyPath}' git push ${cfg.pushUrl} HEAD:${targetRef}
|
||||||
|
|
Loading…
Reference in a new issue