From c0ecde349a19a5c19315d72cfbaffb7d72a77455 Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Tue, 28 May 2024 15:07:06 +0530 Subject: [PATCH] ci: delete the branch after merging flake updates --- .github/workflows/update-flake-lock-ex-share-northwind.yaml | 2 +- .github/workflows/update-flake-lock-ex-share-pgweb.yaml | 2 +- .github/workflows/update-flake-lock-ex-simple.yaml | 2 +- .github/workflows/update-flake-lock-test.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-flake-lock-ex-share-northwind.yaml b/.github/workflows/update-flake-lock-ex-share-northwind.yaml index 1e056e0e..547b944d 100644 --- a/.github/workflows/update-flake-lock-ex-share-northwind.yaml +++ b/.github/workflows/update-flake-lock-ex-share-northwind.yaml @@ -35,7 +35,7 @@ jobs: path-to-flake-dir: 'example/share-services/northwind' branch: "update_flake_lock_ex_share_northwind" token: ${{ steps.github-app-token.outputs.token }} - - run: "gh pr merge --auto --rebase ${{ steps.update-flake-lock.outputs.pull-request-number }}" + - run: "gh pr merge --auto --rebase --delete-branch ${{ steps.update-flake-lock.outputs.pull-request-number }}" env: GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/update-flake-lock-ex-share-pgweb.yaml b/.github/workflows/update-flake-lock-ex-share-pgweb.yaml index 6e22fbee..98728ef9 100644 --- a/.github/workflows/update-flake-lock-ex-share-pgweb.yaml +++ b/.github/workflows/update-flake-lock-ex-share-pgweb.yaml @@ -35,7 +35,7 @@ jobs: path-to-flake-dir: 'example/share-services/pgweb' branch: "update_flake_lock_ex_share_pgweb" token: ${{ steps.github-app-token.outputs.token }} - - run: "gh pr merge --auto --rebase ${{ steps.update-flake-lock.outputs.pull-request-number }}" + - run: "gh pr merge --auto --rebase --delete-branch ${{ steps.update-flake-lock.outputs.pull-request-number }}" env: GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/update-flake-lock-ex-simple.yaml b/.github/workflows/update-flake-lock-ex-simple.yaml index a1130229..82aa066c 100644 --- a/.github/workflows/update-flake-lock-ex-simple.yaml +++ b/.github/workflows/update-flake-lock-ex-simple.yaml @@ -35,6 +35,6 @@ jobs: path-to-flake-dir: 'example/simple' branch: "update_flake_lock_ex_simple" token: ${{ steps.github-app-token.outputs.token }} - - run: "gh pr merge --auto --rebase ${{ steps.update-flake-lock.outputs.pull-request-number }}" + - run: "gh pr merge --auto --rebase --delete-branch ${{ steps.update-flake-lock.outputs.pull-request-number }}" env: GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/update-flake-lock-test.yaml b/.github/workflows/update-flake-lock-test.yaml index ec81f459..508f848b 100644 --- a/.github/workflows/update-flake-lock-test.yaml +++ b/.github/workflows/update-flake-lock-test.yaml @@ -35,7 +35,7 @@ jobs: path-to-flake-dir: 'test' branch: "update_flake_lock_test" token: ${{ steps.github-app-token.outputs.token }} - - run: "gh pr merge --auto --rebase ${{ steps.update-flake-lock.outputs.pull-request-number }}" + - run: "gh pr merge --auto --rebase --delete-branch ${{ steps.update-flake-lock.outputs.pull-request-number }}" env: GH_TOKEN: ${{ github.token }}