From 5d6dab3cabd2cacf201b26bc80d41db472afe6bf Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sun, 30 Jul 2023 09:49:53 -0400 Subject: [PATCH] auth automerge and run status check in same action --- .github/workflows/check.yml | 1 - .github/workflows/update.yml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 629f2bf..6704b4a 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,7 +2,6 @@ name: Check Build on: workflow_dispatch: # allows manual triggering - pull_request: jobs: check: diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index fdd44fa..ab28c54 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -20,6 +20,8 @@ jobs: uses: DeterminateSystems/nix-installer-action@v4 - name: Check Nixpkgs Inputs uses: DeterminateSystems/flake-checker-action@v5 + - name: Add Nix Cache + uses: DeterminateSystems/magic-nix-cache-action@v2 - name: Update flake.lock uses: DeterminateSystems/update-flake-lock@v19 id: update @@ -28,5 +30,9 @@ jobs: pr-labels: | # Labels to be set on the PR dependencies automated + - name: Check the Flake + run: nix flake check - name: Enable Pull Request Automerge run: gh pr merge --merge --auto ${{ steps.update.outputs.pull-request-number }} + env: + GH_TOKEN: ${{ github.token }}