From 9d05798e16691e832f97aacf2bbb884adbe4bfed Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 14 Jan 2022 03:37:44 +0200 Subject: [PATCH] .github: set defaultBranch, switch to squash merge --- .github/workflows/test_dep_update.sh | 2 +- .github/workflows/update-dependencies.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_dep_update.sh b/.github/workflows/test_dep_update.sh index 05f8e7e..dfa3752 100755 --- a/.github/workflows/test_dep_update.sh +++ b/.github/workflows/test_dep_update.sh @@ -8,7 +8,7 @@ git checkout depupdate json="$(gh pr list --search "author:app/github-actions" --json headRefName,number)" echo "$json" | jq '.[] | .headRefName | @text' | xargs -L1 -- git pull --rebase origin if nix flake check; then - echo "$json" | jq ".[] | .number | @text" | xargs -L1 -- gh pr merge --rebase --delete-branch + echo "$json" | jq ".[] | .number | @text" | xargs -L1 -- gh pr merge --squash --delete-branch else gh issue create \ --title "Recent Dependency update PRs failing tests" \ diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index b90e95a..a07166b 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -39,6 +39,7 @@ jobs: git config --global core.autocrlf false git config --global user.name github-actions[bot] git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com + git config --global init.defaultBranch main - uses: actions/checkout@v2 with: # Nix Flakes doesn't work on shallow clones