From 19d2937141236214e109581a21a0e525334dc8bc Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 23:30:10 +0100 Subject: [PATCH] .... --- .../{pr-closed.yml => develop-pr-closed.yml} | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) rename .gitea/workflows/{pr-closed.yml => develop-pr-closed.yml} (65%) diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/develop-pr-closed.yml similarity index 65% rename from .gitea/workflows/pr-closed.yml rename to .gitea/workflows/develop-pr-closed.yml index 2202e51..50ce1f4 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/develop-pr-closed.yml @@ -6,23 +6,11 @@ on: - closed - deleted branches: - - 'master' + - master jobs: - if_merged: - if: github.event.pull_request.merged == true - runs-on: ubuntu-latest - steps: - - name: delete develop branch - id: delete_develop_branch - run: git push origin --delete ${{ github.head_ref }} - continue-on-error: true - - uses: mainmatter/continue-on-error-comment@v1 - with: - repo-token: ${{ secrets.BOT_TOKEN }} - outcome: ${{ steps.delete_develop_branch.outcome }} - test-id: Error code ${{ matrix.code }} delete-develop: + if: ${{ ! startsWith(github.head_ref, 'develop/') }} runs-on: ubuntu-latest steps: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 @@ -42,4 +30,6 @@ jobs: firstString=${{ github.head_ref }} secondString="build" echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s + - name: delete build branch + run: git push origin --delete ${{ env.BUILD_BRANCH }} \ No newline at end of file