Skip to content

Commit 45b5cbf

Browse files
authored
chore(ci): small enhancement (#556)
* chore(ci): rework mergify configuration * chore: upddate github-actions versions
1 parent b3b62c6 commit 45b5cbf

File tree

4 files changed

+15
-42
lines changed

4 files changed

+15
-42
lines changed

.github/mergify.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
defaults:
2-
actions:
3-
queue:
4-
allow_merging_configuration_change: true
5-
61
queue_rules:
72
- name: default
83
conditions:
9-
- check-success=buildbot/nix-eval
4+
- "check-success=buildbot/nix-build"
5+
batch_size: 1
6+
batch_max_wait_time: "15 minutes"
7+
merge_method: squash
8+
commit_message_template: |
9+
{{ title }} (#{{ number }})
10+
11+
{{ body }}
1012
1113
pull_request_rules:
1214
- name: Automerge PRs using the merge queue
@@ -16,10 +18,12 @@ pull_request_rules:
1618
actions:
1719
queue:
1820
name: default
19-
method: squash
21+
delete_head_branch:
22+
force: true
2023

2124
- name: Delete head branch after merge
2225
conditions:
26+
- "closed"
2327
- "merged"
2428
actions:
2529
delete_head_branch: {}

.github/workflows/gh-pages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout repository
1515
uses: actions/checkout@v4
1616
- name: Install Nix
17-
uses: cachix/install-nix-action@v23
17+
uses: cachix/install-nix-action@v30
1818
- name: Build GitHub Pages
1919
id: build
2020
run: |

.github/workflows/update-inputs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout repository
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
- name: Install Nix
13-
uses: cachix/install-nix-action@v20
13+
uses: cachix/install-nix-action@v30
1414
- name: Update flake inputs
1515
id: update
16-
uses: DeterminateSystems/update-flake-lock@v19
16+
uses: DeterminateSystems/update-flake-lock@v24
1717
with:
1818
sign-commits: true
1919
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/update-packages.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)