diff --git a/.github/workflows/dev-latest.yml b/.github/workflows/dev-latest.yml index 5a3ef0da..4a73e20a 100644 --- a/.github/workflows/dev-latest.yml +++ b/.github/workflows/dev-latest.yml @@ -2,8 +2,6 @@ name: Deploy To Dockerhub(dev) on: push: - branches: - - '*-dev' tags: - '\d+\.\d+\.\d+-beta\d+' - '\d+\.\d+-beta\d+' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 146640c1..7b6661ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,9 +10,9 @@ on: jobs: generate_release_draft: runs-on: ubuntu-latest - if: - - github.event.pull_request.merged == true - - github.event.pull_request.base.ref == 'main' + if: > + github.event.pull_request.merged == true && + github.event.pull_request.base.ref == 'main' steps: - name: Checkout code uses: actions/checkout@v2