From 9134766a73238e124d278f45217dbbf2e1b03185 Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Wed, 21 Dec 2022 01:22:19 +0800 Subject: [PATCH 1/8] Turn on "Report as Error" in Error Code Inspector. --- .github/workflows/build-and-test-pr.yml | 2 +- .github/workflows/build-and-test-scheduled-3.1.yml | 2 +- .github/workflows/build-and-test-scheduled-3.2.yml | 2 +- .github/workflows/release-test-3.1.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 1018219c67b..0f603f7b8d9 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -329,7 +329,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": false + "dubbo.eci.report-as-error": true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index c23d088670d..a99ec1b869a 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -335,7 +335,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": false + "dubbo.eci.report-as-error": true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 9a6e14d9d90..553466f1d42 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -334,7 +334,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": false + "dubbo.eci.report-as-error": true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo diff --git a/.github/workflows/release-test-3.1.yml b/.github/workflows/release-test-3.1.yml index fdab232bfcd..ea02f4af52b 100644 --- a/.github/workflows/release-test-3.1.yml +++ b/.github/workflows/release-test-3.1.yml @@ -332,7 +332,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": false + "dubbo.eci.report-as-error": true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo From b36edb31e0f6a8b444a64a659a1f111e0e94958f Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Wed, 21 Dec 2022 01:36:50 +0800 Subject: [PATCH 2/8] Update release-test-3.1.yml --- .github/workflows/release-test-3.1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-test-3.1.yml b/.github/workflows/release-test-3.1.yml index ea02f4af52b..59323f15408 100644 --- a/.github/workflows/release-test-3.1.yml +++ b/.github/workflows/release-test-3.1.yml @@ -332,7 +332,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": true + dubbo.eci.report-as-error: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo From fe06b2fbc63958682668a9241d2ee58372886c96 Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Wed, 21 Dec 2022 01:37:18 +0800 Subject: [PATCH 3/8] Update build-and-test-pr.yml --- .github/workflows/build-and-test-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 0f603f7b8d9..63421046905 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -329,7 +329,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": true + dubbo.eci.report-as-error: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo From 8608b564948ee4c1e899605cdecd0abaf006620e Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Wed, 21 Dec 2022 01:38:15 +0800 Subject: [PATCH 4/8] Update build-and-test-scheduled-3.1.yml --- .github/workflows/build-and-test-scheduled-3.1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index a99ec1b869a..18dba2e964a 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -335,7 +335,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": true + dubbo.eci.report-as-error: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo From cb9580192e804aabef21b95c475f12b85bf09eac Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Wed, 21 Dec 2022 01:38:36 +0800 Subject: [PATCH 5/8] Update build-and-test-scheduled-3.2.yml --- .github/workflows/build-and-test-scheduled-3.2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 553466f1d42..13823f871a1 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -334,7 +334,7 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - "dubbo.eci.report-as-error": true + dubbo.eci.report-as-error: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo From 1357c063108a379029b11f0934b8b02e0c79c610 Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Wed, 21 Dec 2022 11:07:55 +0800 Subject: [PATCH 6/8] Update pr.yaml. --- .github/workflows/build-and-test-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 63421046905..f880fa819c8 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -329,10 +329,10 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - dubbo.eci.report-as-error: true + DUBBO_ECI_REPORT_AS_ERROR: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector - ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo + ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" uses: actions/upload-artifact@v3 From 1036598ba63be121018118ba3ebb1e3b077edf57 Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Wed, 21 Dec 2022 11:17:41 +0800 Subject: [PATCH 7/8] Update remaining yamls. --- .github/workflows/build-and-test-scheduled-3.1.yml | 4 ++-- .github/workflows/build-and-test-scheduled-3.2.yml | 4 ++-- .github/workflows/release-test-3.1.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index 18dba2e964a..fea7ffd63fc 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -335,10 +335,10 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - dubbo.eci.report-as-error: true + DUBBO_ECI_REPORT_AS_ERROR: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector - ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo + ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" uses: actions/upload-artifact@v3 diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 13823f871a1..79d36d402a8 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -334,10 +334,10 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - dubbo.eci.report-as-error: true + DUBBO_ECI_REPORT_AS_ERROR: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector - ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo + ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" uses: actions/upload-artifact@v3 diff --git a/.github/workflows/release-test-3.1.yml b/.github/workflows/release-test-3.1.yml index 59323f15408..aba7a7c4db5 100644 --- a/.github/workflows/release-test-3.1.yml +++ b/.github/workflows/release-test-3.1.yml @@ -332,10 +332,10 @@ jobs: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C clean install -DskipTests=true -DskipIntegrationTests=true -Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true -Dmaven.javadoc.skip=true - name: "Run Error Code Inspecting" env: - dubbo.eci.report-as-error: true + DUBBO_ECI_REPORT_AS_ERROR: true run: | cd ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector - ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo + ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" uses: actions/upload-artifact@v2 From 02048adf3f2ec413bdbdba6c053d03b0c801c5de Mon Sep 17 00:00:00 2001 From: Andy Cheung Date: Thu, 22 Dec 2022 11:47:21 +0800 Subject: [PATCH 8/8] Always upload ECI results. --- .github/workflows/build-and-test-pr.yml | 2 ++ .github/workflows/build-and-test-scheduled-3.1.yml | 2 ++ .github/workflows/build-and-test-scheduled-3.2.yml | 2 ++ .github/workflows/release-test-3.1.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index f880fa819c8..446b1e6193f 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -335,6 +335,8 @@ jobs: ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" + # always() should not be used here, since we don't need to handle the 'canceled' situation. + if: ${{ success() || failure() }} uses: actions/upload-artifact@v3 with: name: "error-inspection-result" diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index fea7ffd63fc..f82c01fa3af 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -341,6 +341,8 @@ jobs: ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" + # always() should not be used here, since we don't need to handle the 'canceled' situation. + if: ${{ success() || failure() }} uses: actions/upload-artifact@v3 with: name: "error-inspection-result" diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 79d36d402a8..02da5f75205 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -340,6 +340,8 @@ jobs: ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" + # always() should not be used here, since we don't need to handle the 'canceled' situation. + if: ${{ success() || failure() }} uses: actions/upload-artifact@v3 with: name: "error-inspection-result" diff --git a/.github/workflows/release-test-3.1.yml b/.github/workflows/release-test-3.1.yml index aba7a7c4db5..d5ef981f77c 100644 --- a/.github/workflows/release-test-3.1.yml +++ b/.github/workflows/release-test-3.1.yml @@ -338,6 +338,8 @@ jobs: ../mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast -T 2C package exec:java -Ddubbo.eci.report-as-error=${DUBBO_ECI_REPORT_AS_ERROR} -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -Ddubbo.eci.path=${{ github.workspace }}/dubbo - name: "Upload error code inspection result" + # always() should not be used here, since we don't need to handle the 'canceled' situation. + if: ${{ success() || failure() }} uses: actions/upload-artifact@v2 with: name: "error-inspection-result"