From f0fff7ab32d2934f0833eaade376038ebac95677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 23 Jan 2023 09:06:47 +0100 Subject: [PATCH 1/2] ci: automerge flake updates --- .github/workflows/update-flake-lock.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index 6aefd74..2559594 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -16,6 +16,12 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - name: Update flake.lock - uses: DeterminateSystems/update-flake-lock@v15 + uses: DeterminateSystems/update-flake-lock@v16 with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} + pr-body: | + Automated changes by the update-flake-lock + ``` + {{ env.GIT_COMMIT_MESSAGE }} + ``` + bors merge From 3da5595a9cb2c0d68c2cb0bf0a51ecd6589cb398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 23 Jan 2023 09:08:59 +0100 Subject: [PATCH 2/2] drop mergify --- .mergify.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index 94dff70..0000000 --- a/.mergify.yml +++ /dev/null @@ -1,34 +0,0 @@ -pull_request_rules: - - name: automatic merge on CI success - conditions: - - check-success=Evaluate flake.nix - - check-success=check bcachefs [x86_64-linux] - - check-success=check boot-raid1 [x86_64-linux] - - check-success=check btrfs-subvolumes [x86_64-linux] - - check-success=check cli [x86_64-linux] - - check-success=check complex [x86_64-linux] - - check-success=check gpt-bios-compat [x86_64-linux] - - check-success=check luks-lvm [x86_64-linux] - - check-success=check lvm-luks-example-tsp-create [x86_64-linux] - - check-success=check lvm-luks-example-tsp-mount [x86_64-linux] - - check-success=check lvm-raid [x86_64-linux] - - check-success=check mdadm [x86_64-linux] - - check-success=check module [x86_64-linux] - - check-success=check multi-device-no-deps [x86_64-linux] - - check-success=check negative-size [x86_64-linux] - - check-success=check shellcheck [x86_64-linux] - - check-success=check simple-efi [x86_64-linux] - - check-success=check standalone [x86_64-linux] - - check-success=check swap [x86_64-linux] - - check-success=check tmpfs [x86_64-linux] - - check-success=check with-lib [x86_64-linux] - - check-success=check zfs [x86_64-linux] - - check-success=check zfs-over-legacy [x86_64-linux] - - check-success=package default [x86_64-linux] - - check-success=package disko [x86_64-linux] - - - author=nix-eval-jobs-bot - actions: - merge: - method: merge - delete_head_branch: {}