From 39be8c6dc3dd5b22505a3f5294ca04be92d63d14 Mon Sep 17 00:00:00 2001 From: estrella Date: Sun, 11 Jun 2023 11:08:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?change:=20update=20ci,=20allow=20push=20to?= =?UTF-8?q?=20targger=20it.=E2=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65c52bf1..d2c8f423 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,12 +3,6 @@ name: Build Docker on: pull_request: push: - tags: - - '\d+\.\d+\.\d+' - - '\d+\.\d+' - - '\d+\.\d+\.\d+-beta\d+' - - '\d+\.\d+-beta\d+' - - '\d+\.\d+-alpha\d+' jobs: test: @@ -32,6 +26,9 @@ jobs: build-webui: runs-on: ubuntu-latest + if: > + ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true }} + || ${{ github.event_name == 'push' && contains(github.ref, 'tags') }} needs: [test] steps: - name: Checkout @@ -63,7 +60,7 @@ jobs: build-docker: runs-on: ubuntu-latest - needs: [test, build-webui] + needs: [build-webui] steps: - name: Checkout uses: actions/checkout@v3 From d3d98c816605ff1212cadab205b5e82e3619eaa8 Mon Sep 17 00:00:00 2001 From: estrella Date: Sun, 11 Jun 2023 11:15:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change:=20update=20ci,=20allow=20push=20to?= =?UTF-8?q?=20trigger=20it.=E2=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2c8f423..edd975a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: build-webui: runs-on: ubuntu-latest if: > - ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true }} - || ${{ github.event_name == 'push' && contains(github.ref, 'tags') }} + ${{ github.event_name == 'pull_request' }} || + ${{ github.event_name == 'push' && github.ref_type == 'tag' && (contains(github.ref, 'alpha') || contains(github.ref, 'beta')) }} needs: [test] steps: - name: Checkout