From fbf13768d1d52f1f9519c6395308f7c21db67b07 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Sun, 14 May 2023 11:21:52 +0800 Subject: [PATCH] Fix worksflow --- .github/workflows/dev-latest.yml | 2 -- .github/workflows/release.yml | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) 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