Skip to content

Commit

Permalink
chore(ci): small enhancement (#556)
Browse files Browse the repository at this point in the history
* chore(ci): rework mergify configuration

* chore: upddate github-actions versions
  • Loading branch information
selfuryon authored Oct 31, 2024
1 parent b3b62c6 commit 45b5cbf
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 42 deletions.
18 changes: 11 additions & 7 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
defaults:
actions:
queue:
allow_merging_configuration_change: true

queue_rules:
- name: default
conditions:
- check-success=buildbot/nix-eval
- "check-success=buildbot/nix-build"
batch_size: 1
batch_max_wait_time: "15 minutes"
merge_method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
pull_request_rules:
- name: Automerge PRs using the merge queue
Expand All @@ -16,10 +18,12 @@ pull_request_rules:
actions:
queue:
name: default
method: squash
delete_head_branch:
force: true

- name: Delete head branch after merge
conditions:
- "closed"
- "merged"
actions:
delete_head_branch: {}
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Nix
uses: cachix/install-nix-action@v23
uses: cachix/install-nix-action@v30
- name: Build GitHub Pages
id: build
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-inputs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Nix
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v30
- name: Update flake inputs
id: update
uses: DeterminateSystems/update-flake-lock@v19
uses: DeterminateSystems/update-flake-lock@v24
with:
sign-commits: true
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/update-packages.yaml

This file was deleted.

0 comments on commit 45b5cbf

Please sign in to comment.