diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index cda9c75..7a8f3b0 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -16,7 +16,7 @@ jobs: with: action: yml path: '.' - - name: get production branch name + - name: get development branch name run: | firstString=${{ github.ref_name }} secondString="develop-" diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index 1ee7ffb..2dc4b77 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -10,6 +10,7 @@ jobs: if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: + - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - name: on-merge run: | echo The PR was merged into ${{ github.event.pull_request.base.ref }} from ${{ github.ref_name }} from ${{ github.ref }} type ${{ github.ref_type }} @@ -18,4 +19,13 @@ jobs: echo head_ref : ${{ github.head_ref }} echo env: ${{ env.GITHUB_HEAD_REF }} echo env: ${{ env.GITHUB_BASE_REF }} + - name: delete develop branch + run: git push origin --delete ${{ github.head_ref }} + - name: get build branch name + run: | + firstString=${{ github.head_ref }} + secondString="build-" + echo ::set-env name=BUILD_BRANCH::${firstString/format-/"$secondString"} + - name: delete build branch + run: git push origin --delete ${{ env.BUILD_BRANCH }} \ No newline at end of file