From 33654f9f766b2172b9a37282fefbf3afbf8d0420 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 15:26:02 +0800 Subject: [PATCH 01/13] try to fix ci --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index f35c8d13df6f..9c04b9809d6e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -160,7 +160,7 @@ jobs: steps: - name: Status run: | - if [[ ${{ needs.e2e.result }} == 'success' || ${{ needs.paths-filter.outputs.ignore == 'true' }} ]]; then + if [[ ${{ needs.e2e.result == 'success' || needs.paths-filter.outputs.ignore == 'true' }} ]]; then echo "Passed!" else exit -1 From 99c16878620bd6d80c34d9ff06ebab3bdb9c9933 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 15:27:23 +0800 Subject: [PATCH 02/13] try to fix ci --- .../dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java index 76fb3674bb54..84dcf340afd7 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java @@ -88,6 +88,8 @@ void testCreateMysqlDataSource() { .as("DataSource list should contain newly-created database") .extracting(WebElement::getText) .anyMatch(it -> it.contains(dataSourceName))); + + throw new RuntimeException("test"); } @Test From 33d3db68e7996ffbaf81e5ab96600f2152c8f034 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 15:43:00 +0800 Subject: [PATCH 03/13] try to fix ci --- .github/workflows/e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 9c04b9809d6e..314908bf226e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -155,12 +155,12 @@ jobs: name: E2E runs-on: ubuntu-latest timeout-minutes: 30 - needs: [ e2e ] + needs: [ e2e, paths-filter ] if: always() steps: - name: Status run: | - if [[ ${{ needs.e2e.result == 'success' || needs.paths-filter.outputs.ignore == 'true' }} ]]; then + if [[ ${{ needs.e2e.result }} == 'success' || ${{ needs.paths-filter.outputs.ignore }} == 'true' ]]; then echo "Passed!" else exit -1 From 38826f83039131bbc056941c0fcdcb380661168a Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 16:17:49 +0800 Subject: [PATCH 04/13] try to fix ci --- .github/workflows/e2e.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 314908bf226e..2430f48612bb 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -40,7 +40,7 @@ jobs: with: filters: | ignore: - - '(docs/**)' + - '(docs/**|.github/**)' build: name: E2E-Build needs: paths-filter @@ -160,8 +160,10 @@ jobs: steps: - name: Status run: | - if [[ ${{ needs.e2e.result }} == 'success' || ${{ needs.paths-filter.outputs.ignore }} == 'true' ]]; then + if [[ ${{ needs.e2e.result }} == 'success' ]]; then echo "Passed!" + elif [[ ${{ needs.paths-filter.outputs.ignore }} == 'true' ]]; then + echo "Skip ${ name }" else exit -1 fi From cc8315b72258ef1caea6b5d9ef2befd43515303f Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 16:22:23 +0800 Subject: [PATCH 05/13] try to fix ci --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2430f48612bb..d4da58e5b301 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -163,7 +163,7 @@ jobs: if [[ ${{ needs.e2e.result }} == 'success' ]]; then echo "Passed!" elif [[ ${{ needs.paths-filter.outputs.ignore }} == 'true' ]]; then - echo "Skip ${ name }" + echo "Skip ${{ name }}" else exit -1 fi From b1261e64b62ea9ac873550a5d249370bbc294da1 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 16:25:44 +0800 Subject: [PATCH 06/13] try to fix ci --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d4da58e5b301..2587056119b3 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -163,7 +163,7 @@ jobs: if [[ ${{ needs.e2e.result }} == 'success' ]]; then echo "Passed!" elif [[ ${{ needs.paths-filter.outputs.ignore }} == 'true' ]]; then - echo "Skip ${{ name }}" + echo "Skip ${{ result.name }}" else exit -1 fi From f28a0a9eebef3fd53e5c67dd37d5df014485b21f Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 16:27:03 +0800 Subject: [PATCH 07/13] try to fix ci --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2587056119b3..25e926e47d46 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -163,7 +163,7 @@ jobs: if [[ ${{ needs.e2e.result }} == 'success' ]]; then echo "Passed!" elif [[ ${{ needs.paths-filter.outputs.ignore }} == 'true' ]]; then - echo "Skip ${{ result.name }}" + echo "Skip E2E" else exit -1 fi From 5e8011b941d2b84d2df7c096d5474f44bd899703 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 17:11:42 +0800 Subject: [PATCH 08/13] try to fix ci --- .github/workflows/e2e.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 25e926e47d46..de071ab8ef65 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -33,18 +33,18 @@ jobs: name: E2E-Path-Filter runs-on: ubuntu-latest outputs: - ignore: ${{ steps.filter.outputs.ignore }} + ignore: ${{ steps.filter.outputs.not-ignore }} steps: - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721 id: filter with: filters: | - ignore: - - '(docs/**|.github/**)' + not-ignore: + - '!(docs/**)' build: name: E2E-Build needs: paths-filter - if: ${{ needs.paths-filter.outputs.ignore == 'false' }} + if: ${{ needs.paths-filter.outputs.not-ignore == 'true' }} runs-on: ubuntu-latest timeout-minutes: 20 steps: @@ -162,7 +162,7 @@ jobs: run: | if [[ ${{ needs.e2e.result }} == 'success' ]]; then echo "Passed!" - elif [[ ${{ needs.paths-filter.outputs.ignore }} == 'true' ]]; then + elif [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then echo "Skip E2E" else exit -1 From a6b990d67ae2a25e1c689644c8277c635958bcab Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 17:11:57 +0800 Subject: [PATCH 09/13] try to fix ci --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index de071ab8ef65..5dfe2195334c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -40,7 +40,7 @@ jobs: with: filters: | not-ignore: - - '!(docs/**)' + - '!(docs/**|.github/**)' build: name: E2E-Build needs: paths-filter From 6a30786e8fcb95767461538847d86855ff843bbc Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 17:21:14 +0800 Subject: [PATCH 10/13] try to fix ci --- .github/workflows/backend.yml | 14 ++++++++------ .github/workflows/e2e.yml | 4 ++-- .github/workflows/unit-test.yml | 14 ++++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index bb2b65c56ddc..deb85d1ec139 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -42,18 +42,18 @@ jobs: name: Backend-Path-Filter runs-on: ubuntu-latest outputs: - ignore: ${{ steps.filter.outputs.ignore }} + not-ignore: ${{ steps.filter.outputs.not-ignore }} steps: - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721 id: filter with: filters: | - ignore: - - '(docs/**|dolphinscheduler-ui/**|dolphinscheduler-ui-next/**)' + not-ignore: + - '!(docs/**|dolphinscheduler-ui/**|dolphinscheduler-ui-next/**)' build: name: Backend-Build needs: paths-filter - if: ${{ needs.paths-filter.outputs.ignore == 'false' }} + if: ${{ needs.paths-filter.outputs.not-ignore == 'true' }} runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -81,13 +81,15 @@ jobs: name: Build runs-on: ubuntu-latest timeout-minutes: 30 - needs: [ build ] + needs: [ build, paths-filter ] if: always() steps: - name: Status run: | - if [[ ${{ needs.build.result }} == 'success' || ${{ needs.paths-filter.outputs.ignore == 'true' }} ]]; then + if [[ ${{ needs.build.result }} == 'success' ]]; then echo "Passed!" + elif [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then + echo "Skip Build!" else exit -1 fi diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5dfe2195334c..cd22539aa65a 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -33,7 +33,7 @@ jobs: name: E2E-Path-Filter runs-on: ubuntu-latest outputs: - ignore: ${{ steps.filter.outputs.not-ignore }} + not-ignore: ${{ steps.filter.outputs.not-ignore }} steps: - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721 id: filter @@ -163,7 +163,7 @@ jobs: if [[ ${{ needs.e2e.result }} == 'success' ]]; then echo "Passed!" elif [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then - echo "Skip E2E" + echo "Skip E2E!" else exit -1 fi diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index b66674110709..2071654097b6 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -40,18 +40,18 @@ jobs: name: Unit-Test-Path-Filter runs-on: ubuntu-latest outputs: - ignore: ${{ steps.filter.outputs.ignore }} + not-ignore: ${{ steps.filter.outputs.not-ignore }} steps: - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721 id: filter with: filters: | - ignore: - - '(docs/**)' + not-ignore: + - '!(docs/**)' unit-test: name: Unit-Test needs: paths-filter - if: ${{ needs.paths-filter.outputs.ignore == 'false' }} + if: ${{ needs.paths-filter.outputs.not-ignore == 'true' }} runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -114,13 +114,15 @@ jobs: name: Unit Test runs-on: ubuntu-latest timeout-minutes: 30 - needs: [ unit-test ] + needs: [ unit-test, paths-filter ] if: always() steps: - name: Status run: | - if [[ ${{ needs.unit-test.result }} == 'success' || ${{ needs.paths-filter.outputs.ignore == 'true' }} ]]; then + if [[ ${{ needs.unit-test.result }} == 'success' ]]; then echo "Passed!" + elif [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then + echo "Skip Unit Test!" else exit -1 fi From 01a24cabed8ba98e244a35f6861628ad084e998d Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 17:36:51 +0800 Subject: [PATCH 11/13] try to fix ci --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cd22539aa65a..88168b4bc10c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -40,7 +40,7 @@ jobs: with: filters: | not-ignore: - - '!(docs/**|.github/**)' + - '!(docs/**)' build: name: E2E-Build needs: paths-filter From e2a82712333f7c81659755590b14ca8a4ed0770f Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 17:53:09 +0800 Subject: [PATCH 12/13] try to fix ci --- .../dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java index 84dcf340afd7..76fb3674bb54 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/MysqlDataSourceE2ETest.java @@ -88,8 +88,6 @@ void testCreateMysqlDataSource() { .as("DataSource list should contain newly-created database") .extracting(WebElement::getText) .anyMatch(it -> it.contains(dataSourceName))); - - throw new RuntimeException("test"); } @Test From 32dbb89681f9d83fbae5a1944376febc376cd3ab Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Wed, 6 Apr 2022 21:22:39 +0800 Subject: [PATCH 13/13] try to fix ci --- .github/workflows/backend.yml | 9 +++++---- .github/workflows/e2e.yml | 9 +++++---- .github/workflows/unit-test.yml | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index deb85d1ec139..c9fcc543b3a1 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -86,10 +86,11 @@ jobs: steps: - name: Status run: | - if [[ ${{ needs.build.result }} == 'success' ]]; then - echo "Passed!" - elif [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then + if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then echo "Skip Build!" - else + exit 0 + fi + if [[ ${{ needs.build.result }} != 'success' ]]; then + echo "Build Failed!" exit -1 fi diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 88168b4bc10c..f34be88b170c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -160,10 +160,11 @@ jobs: steps: - name: Status run: | - if [[ ${{ needs.e2e.result }} == 'success' ]]; then - echo "Passed!" - elif [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then + if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then echo "Skip E2E!" - else + exit 0 + fi + if [[ ${{ needs.e2e.result }} != 'success' ]]; then + echo "E2E Failed!" exit -1 fi diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 2071654097b6..d7016ad99143 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -119,10 +119,11 @@ jobs: steps: - name: Status run: | - if [[ ${{ needs.unit-test.result }} == 'success' ]]; then - echo "Passed!" - elif [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then + if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' ]]; then echo "Skip Unit Test!" - else + exit 0 + fi + if [[ ${{ needs.unit-test.result }} != 'success' ]]; then + echo "Unit Test Failed!" exit -1 fi