summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorseth <[email protected]>2023-07-03 19:06:19 -0400
committerseth <[email protected]>2023-07-03 19:06:19 -0400
commitd80252e7a7fed5667d4a0bfdaddbf2c06d91a033 (patch)
treeea4c0afb3d06f67cf06e610fd0fbc7d851a7def6 /.github
parentce076b9b811f838e05859b8a4c5d0cbac6e9cc7f (diff)
ci: auto merge flake lock updates
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/audit.yaml7
-rw-r--r--.github/workflows/update-flake.yaml9
2 files changed, 10 insertions, 6 deletions
diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml
index ade1ce9..03bdf65 100644
--- a/.github/workflows/audit.yaml
+++ b/.github/workflows/audit.yaml
@@ -14,11 +14,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: setup nix & cachix
- uses: ./.github/actions/setup-nix
- with:
- cachix-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
- name: run audit
run: |
- nix build -L .#checks.x86_64-linux.audit
+ nix build --accept-flake-config -L .#checks.x86_64-linux.audit
diff --git a/.github/workflows/update-flake.yaml b/.github/workflows/update-flake.yaml
index 9ac2d4e..e5c1e45 100644
--- a/.github/workflows/update-flake.yaml
+++ b/.github/workflows/update-flake.yaml
@@ -8,6 +8,7 @@ on:
workflow_dispatch:
permissions:
+ contents: write
pull-requests: write
jobs:
@@ -19,6 +20,14 @@ jobs:
- uses: cachix/install-nix-action@v22
- uses: DeterminateSystems/update-flake-lock@v19
+ id: update
with:
commit-msg: "deps(flake): update inputs"
pr-title: "deps(flake): update inputs"
+
+ - name: auto-merge pull request
+ shell: bash
+ run: gh pr merge --auto --rebase "$PR_ID"
+ env:
+ GITHUB_TOKEN: ${{ github.token }}
+ PR_ID: ${{ steps.update.outputs.pull-request-number }}