awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-29 14:33:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

.github: set defaultBranch, switch to squash merge

Browse Source
This commit is contained in:
ckie
2022-01-14 03:37:44 +02:00
parent 513796b2a2
commit 9d05798e16
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test_dep_update.sh vendored
View File

@@ -8,7 +8,7 @@ git checkout depupdate
json="$(gh pr list --search "author:app/github-actions" --json headRefName,number)" json="$(gh pr list --search "author:app/github-actions" --json headRefName,number)"
echo "$json" | jq '.[] | .headRefName | @text' | xargs -L1 -- git pull --rebase origin echo "$json" | jq '.[] | .headRefName | @text' | xargs -L1 -- git pull --rebase origin
if nix flake check; then 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 else
gh issue create \ gh issue create \
--title "Recent Dependency update PRs failing tests" \ --title "Recent Dependency update PRs failing tests" \

1
.github/workflows/update-dependencies.yml vendored
View File

@@ -39,6 +39,7 @@ jobs:
git config --global core.autocrlf false git config --global core.autocrlf false
git config --global user.name github-actions[bot] git config --global user.name github-actions[bot]
git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
git config --global init.defaultBranch main
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
# Nix Flakes doesn't work on shallow clones # Nix Flakes doesn't work on shallow clones