Revert "switch to mergify"
This reverts commit 6b948a13c8
.
doesn't currently work with github merge queue
This commit is contained in:
parent
a6282b2f52
commit
efeb2ce042
4 changed files with 9 additions and 21 deletions
17
.github/mergify.yml
vendored
17
.github/mergify.yml
vendored
|
@ -1,17 +0,0 @@
|
||||||
pull_request_rules:
|
|
||||||
- name: automatic merge on CI success
|
|
||||||
conditions:
|
|
||||||
- base=master
|
|
||||||
- check-success=ci/hercules/evaluation
|
|
||||||
- check-success=ci/hercules/onPush/default
|
|
||||||
- or:
|
|
||||||
- and:
|
|
||||||
- author=github-actions[bot]
|
|
||||||
- label=automerge
|
|
||||||
- and:
|
|
||||||
- author=hercules-ci[bot]
|
|
||||||
actions:
|
|
||||||
merge:
|
|
||||||
method: rebase
|
|
||||||
allow_merging_configuration_change: true
|
|
||||||
delete_head_branch: {}
|
|
4
.github/settings.yml
vendored
4
.github/settings.yml
vendored
|
@ -152,6 +152,6 @@ branches:
|
||||||
required_linear_history: false
|
required_linear_history: false
|
||||||
# Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
|
# Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
|
||||||
restrictions:
|
restrictions:
|
||||||
apps: ["mergify"]
|
apps: ["hercules-ci"]
|
||||||
users: []
|
users: ["nix-infra-bot"]
|
||||||
teams: []
|
teams: []
|
||||||
|
|
|
@ -13,8 +13,12 @@ jobs:
|
||||||
extra_nix_config: |
|
extra_nix_config: |
|
||||||
experimental-features = nix-command flakes
|
experimental-features = nix-command flakes
|
||||||
- name: Update flake.lock
|
- name: Update flake.lock
|
||||||
|
id: update
|
||||||
uses: DeterminateSystems/update-flake-lock@v19
|
uses: DeterminateSystems/update-flake-lock@v19
|
||||||
with:
|
with:
|
||||||
|
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
||||||
inputs: nixpkgs-update
|
inputs: nixpkgs-update
|
||||||
pr-labels: |
|
- name: Enable Automerge
|
||||||
automerge
|
run: gh pr merge --rebase --auto "${{ steps.update.outputs.pull-request-number }}"
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
||||||
|
|
|
@ -61,6 +61,7 @@
|
||||||
hercules-ci.flake-update = {
|
hercules-ci.flake-update = {
|
||||||
enable = true;
|
enable = true;
|
||||||
createPullRequest = true;
|
createPullRequest = true;
|
||||||
|
autoMergeMethod = "rebase";
|
||||||
when = {
|
when = {
|
||||||
hour = [ 2 ];
|
hour = [ 2 ];
|
||||||
dayOfWeek = [ "Mon" "Thu" ];
|
dayOfWeek = [ "Mon" "Thu" ];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue