From 3716419055f11a80c3bab92de343075c15f84be1 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 2 Jul 2023 12:28:11 -0400 Subject: !hercules-ci -> garnix --- .github/actions/flake-update/action.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.github/actions/flake-update') diff --git a/.github/actions/flake-update/action.yaml b/.github/actions/flake-update/action.yaml index 62f3695..2485186 100644 --- a/.github/actions/flake-update/action.yaml +++ b/.github/actions/flake-update/action.yaml @@ -1,18 +1,18 @@ name: "update flake inputs" description: "wrapper around DeterminateSystems/update-flake-lock" inputs: - update-token: - description: "github write token for creating prs" + commit-msg: required: true github-token: - description: "github read token for avoid rate limits" + description: "github read token for increasing rate limits" required: false default: "" inputs: description: "flake inputs to update" required: false default: "" - commit-msg: + update-token: + description: "github write token for creating prs" required: true runs: using: "composite" @@ -30,7 +30,7 @@ runs: token: ${{ inputs.update-token }} - name: auto-merge pull request - run: gh pr merge --auto --squash "$PR_ID" + run: gh pr merge --auto --rebase "$PR_ID" env: GITHUB_TOKEN: ${{ inputs.update-token }} PR_ID: ${{ steps.update.outputs.pull-request-number }} -- cgit v1.2.3