From ce2c52cb5837c924ea2f1694e81029dde56d736d Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 20:41:13 +0100 Subject: [PATCH] package.json --- .gitea/workflows/pr-closed.yml | 41 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index 7ce4ae2..4827c11 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -9,26 +9,6 @@ on: - 'master' jobs: - delete: - runs-on: ubuntu-latest - steps: - - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - with: - token: ${{ secrets.BOT_TOKEN }} - - 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 }} - - name: get build branch name - run: | - firstString=${{ github.head_ref }} - secondString="build" - echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s if_merged: if: github.event.pull_request.merged == true runs-on: ubuntu-latest @@ -55,3 +35,24 @@ jobs: repo-token: ${{ secrets.BOT_TOKEN }} outcome: ${{ steps.delete_develop_branch.outcome }} test-id: Error code ${{ matrix.code }} + delete-develop: + runs-on: ubuntu-latest + steps: + - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 + with: + token: ${{ secrets.BOT_TOKEN }} + - 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 }} + - name: get build branch name + run: | + firstString=${{ github.head_ref }} + secondString="build" + echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s + \ No newline at end of file