From 9d2b5f11b0949c8b324d0f8d67460a3ce98f55b3 Mon Sep 17 00:00:00 2001 From: pyshx Date: Wed, 7 Jun 2023 19:41:55 +0530 Subject: [PATCH 1/3] ci: fix build deadlock after ci finishes --- .github/workflows/ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b37807afa..56e25d94c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,18 +51,22 @@ jobs: steps: - run: echo OK build-web: - needs: ci + needs: + - ci + - ci-web runs-on: ubuntu-latest - if: github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/')) + if: !failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/')) steps: - name: Dispatch Web Build uses: peter-evans/repository-dispatch@v2 with: event-type: build-web build-server: - needs: ci + needs: + - ci + - ci-server runs-on: ubuntu-latest - if: github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/')) + if: !failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/')) steps: - name: Dispatch Web Build uses: peter-evans/repository-dispatch@v2 From a38215837f6a835822844b58fe58d186384c30d5 Mon Sep 17 00:00:00 2001 From: pyshx Date: Wed, 7 Jun 2023 19:46:59 +0530 Subject: [PATCH 2/3] fix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56e25d94c8..45717c5d40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - ci - ci-web runs-on: ubuntu-latest - if: !failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/')) + if: $${{!failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/'))}} steps: - name: Dispatch Web Build uses: peter-evans/repository-dispatch@v2 @@ -66,7 +66,7 @@ jobs: - ci - ci-server runs-on: ubuntu-latest - if: !failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/')) + if: ${{!failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/'))}} steps: - name: Dispatch Web Build uses: peter-evans/repository-dispatch@v2 From b836f551244b85b75fa377c49035b756bc0a1bf3 Mon Sep 17 00:00:00 2001 From: pyshx Date: Wed, 7 Jun 2023 20:13:33 +0530 Subject: [PATCH 3/3] fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45717c5d40..562374b316 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - ci - ci-web runs-on: ubuntu-latest - if: $${{!failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/'))}} + if: ${{!failure() && github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'release' || startsWith(github.ref_name, 'release/'))}} steps: - name: Dispatch Web Build uses: peter-evans/repository-dispatch@v2