From 1d6b419a15be3a3b360ef0c066b9c7f3c5b44808 Mon Sep 17 00:00:00 2001 From: trev Date: Fri, 16 May 2025 15:04:39 -0400 Subject: [PATCH] fix: git automerge --- .gitea/workflows/update.yaml | 2 +- .github/workflows/update.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/update.yaml b/.gitea/workflows/update.yaml index 9270e46..63d3a14 100644 --- a/.gitea/workflows/update.yaml +++ b/.gitea/workflows/update.yaml @@ -35,7 +35,7 @@ jobs: - name: Update run: nix run .#update - - name: Create Gitea PR + - name: Create Pull Request env: URL: ${{ vars.URL }} PAT: ${{ secrets.PAT }} diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 453dfcb..685250f 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -37,6 +37,7 @@ jobs: run: nix run .#update - name: Create Pull Request + id: cpr uses: peter-evans/create-pull-request@v7 with: branch: update @@ -44,6 +45,6 @@ jobs: body: automatic update - name: Enable Automerge - run: gh pr merge --merge --auto "1" + run: gh pr merge --merge --auto "${{ steps.cpr.outputs.pull-request-number }}" env: GH_TOKEN: ${{ secrets.PAT }}