clerie/nixfiles
1
0
Fork 0
Code

pkgs/nixfiles: nixfiles-updated-inputs push update branch

Browse Source
This commit is contained in:
clerie 2024-02-18 18:49:29 +01:00
parent 9050a99666
commit 704aba254d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/nixfiles/nixfiles-updated-inputs.sh
View File

@ -24,9 +24,12 @@ echo "[!] Update nixpkgs"
nix flake lock --update-input nixpkgs nix flake lock --update-input nixpkgs
echo "[!] Commit changes" echo "[!] Commit changes"
git add flake.lock xgit add flake.lock
xgit commit -m "Update nixpkgs ${NOW}" || true xgit commit -m "Update nixpkgs ${NOW}" || true
echo "[!] Publish ${UPDATE_BRANCH}"
xgit push --set-upstream origin "${UPDATE_BRANCH}"
echo "[!] Merge ${UPDATE_BRANCH} into updated-inputs" echo "[!] Merge ${UPDATE_BRANCH} into updated-inputs"
xgit checkout updated-inputs xgit checkout updated-inputs
xgit merge -s ort -X theirs "${UPDATE_BRANCH}" -m "Update from ${UPDATE_BRANCH}" xgit merge -s ort -X theirs "${UPDATE_BRANCH}" -m "Update from ${UPDATE_BRANCH}"