From 704aba254d2e3c9dc1b04c91dc0cd581a75bcba9 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 18 Feb 2024 18:49:29 +0100 Subject: [PATCH] pkgs/nixfiles: nixfiles-updated-inputs push update branch --- pkgs/nixfiles/nixfiles-updated-inputs.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/nixfiles/nixfiles-updated-inputs.sh b/pkgs/nixfiles/nixfiles-updated-inputs.sh index 5399d0b..2749766 100755 --- a/pkgs/nixfiles/nixfiles-updated-inputs.sh +++ b/pkgs/nixfiles/nixfiles-updated-inputs.sh @@ -24,9 +24,12 @@ echo "[!] Update nixpkgs" nix flake lock --update-input nixpkgs echo "[!] Commit changes" -git add flake.lock +xgit add flake.lock 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" xgit checkout updated-inputs xgit merge -s ort -X theirs "${UPDATE_BRANCH}" -m "Update from ${UPDATE_BRANCH}"