diff --git a/.github/workflows/on-labels.yaml b/.github/workflows/on-labels.yaml deleted file mode 100644 index aa628b95b3..0000000000 --- a/.github/workflows/on-labels.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: Tags - -on: - pull_request: - types: [labeled, closed] - -jobs: - publish-releases: - if: ${{ github.event.label.name == 'pr/release' }} - if: ${{ github.event.pull_request.merged == true }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: echo 'HALLO FROM TAGS 2' diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml index 9e6ec69b70..451b2c0d4c 100644 --- a/.github/workflows/publish-release.yaml +++ b/.github/workflows/publish-release.yaml @@ -3,12 +3,10 @@ name: Publish Release on: pull_request: types: [closed] - branches: - - "publish-release/**" jobs: publish-releases: - if: github.event.pull_request.merged == true + if: ${{ github.base_ref == 'master' && startsWith(github.head_ref, 'publish-release/') && github.event.pull_request.merged == true }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v2