This repository has no description
.github.update-pkgs: merge PRs with a merge commit instead of squashing
author
Hermes
committer
lassulus
date
(Oct 13, 2026, 8:05 PM CEST)
commit
8ebf9a36
8ebf9a363e818b625bb969c44046727845d1a0df
parent
d32ec1b5
d32ec1b59f4304ef7740565f9c0a02c3a6cd7f2f
+5
-5
+5
-5
.github/workflows/update-pkgs.yml
+5
-5
.github/workflows/update-pkgs.yml
···
9
9
# lock: `nix flake update`, pushed as update/flake-lock with its own PR.
10
10
# 2. verify: for every open update/* PR, one after another (flake.lock
11
11
# first), rebase it onto the current master, run ci.yml on that commit
12
-
# (it builds all machines with the farm) and squash-merge the PR only if
13
-
# it succeeded (master's ruleset requires its ci check). A commit that
14
-
# already has a finished run is not checked again, so a failing PR stays
15
-
# open until its branch or master changes.
12
+
# (it builds all machines with the farm) and merge the PR with a merge
13
+
# commit only if it succeeded (master's ruleset requires its ci check). A
14
+
# commit that already has a finished run is not checked again, so a
15
+
# failing PR stays open until its branch or master changes.
16
16
#
17
17
# One PR at a time: the farm builds one commit at a time anyway, and each PR
18
18
# is rebased onto the master it gets merged into.
···
278
278
read -r conclusion sha < <(verify_pr "$branch")
279
279
echo "#$pr: $conclusion"
280
280
if [ "$conclusion" = success ] && [ "$AUTOMERGE" = true ]; then
281
-
gh pr merge "$pr" -R "$repo" --squash --delete-branch --match-head-commit "$sha"
281
+
gh pr merge "$pr" -R "$repo" --merge --delete-branch --match-head-commit "$sha"
282
282
merged=$((merged + 1))
283
283
fi
284
284
echo "::endgroup::"