This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4308430d52b Refactor : refactor the ci by code of conduct (#26935)
(#26936)
4308430d52b is described below
commit 4308430d52befe81b6e13c5ca6509c197b52fcbf
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Thu Jul 13 15:09:58 2023 +0800
Refactor : refactor the ci by code of conduct (#26935) (#26936)
---
.github/workflows/ci.yml | 17 ++++++++---------
.github/workflows/e2e-agent.yml | 10 +++++++---
.github/workflows/e2e-showprocesslist.yml | 2 +-
.../showprocesslist/env/ShowProcessListEnvironment.java | 2 +-
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fc296c953c..b9dc49d4f00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,10 +58,11 @@ jobs:
ci:
name: CI - Compile by JDK 11 and Run on JDK 8
runs-on: ubuntu-latest
- timeout-minutes: 60
+ timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - name: Setup JDK 11 for Build
+ uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
@@ -71,23 +72,21 @@ jobs:
key: ${{ env.REPOSITORY_NAME }}-maven-third-party-${{
hashFiles('**/pom.xml') }}
restore-keys: |
${{ env.REPOSITORY_NAME }}-maven-third-party-
- - name: Build prod with Maven
+ - name: Build Project with Maven
run: ./mvnw -T1C -B -ntp clean install
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
- - name: Run tests with JDK 8
+ - name: Run Tests with JDK 8
run: ./mvnw -T1C -B -ntp -fae test
test-coverage:
if: github.repository == 'apache/shardingsphere'
- name: Test coverage report on JDK ${{ matrix.java-version }}
+ name: Upload Test Coverage Report
runs-on: ubuntu-latest
- strategy:
- matrix:
- java-version: [ 11, 20 ]
+ timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Cache Maven Repos
@@ -100,7 +99,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: ${{ matrix.java-version }}
+ java-version: 11
- name: Build with Maven
run: ./mvnw -T1C -B -ntp clean install -DskipTests
- name: Upload to Codecov
diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml
index 541501fc9be..11150ccbe2d 100644
--- a/.github/workflows/e2e-agent.yml
+++ b/.github/workflows/e2e-agent.yml
@@ -60,7 +60,10 @@ jobs:
mysql:
name: E2E - Agent with MySQL
runs-on: ubuntu-latest
+ timeout-minutes: 15
strategy:
+ max-parallel: 5
+ fail-fast: false
matrix:
include:
- adapter: proxy
@@ -89,7 +92,8 @@ jobs:
plugin: zipkin
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-java@v3
+ - name: Setup JDK 11 for Build
+ uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
@@ -100,7 +104,7 @@ jobs:
restore-keys: |
${{ env.REPOSITORY_NAME }}-maven-third-party-
- name: Build Project
- run: |
+ run:
./mvnw -B clean install -DskipITs -DskipTests -Prelease
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
@@ -108,5 +112,5 @@ jobs:
distribution: 'temurin'
java-version: '8'
- name: Run E2E Test
- run: |
+ run:
./mvnw -B clean install -f test/e2e/agent/plugins/${{ matrix.feature
}}/${{ matrix.plugin }}/pom.xml -Dspotless.apply.skip=true -Dit.env.adapter=${{
matrix.adapter }} -Dit.env.type=${{ matrix.plugin }} -Pit.env.${{
matrix.adapter }}.${{ matrix.plugin }}
diff --git a/.github/workflows/e2e-showprocesslist.yml
b/.github/workflows/e2e-showprocesslist.yml
index a91270ce446..457072c44a5 100644
--- a/.github/workflows/e2e-showprocesslist.yml
+++ b/.github/workflows/e2e-showprocesslist.yml
@@ -81,7 +81,7 @@ jobs:
with:
distribution: 'temurin'
java-version: 11
- - name: Build ShowProcesslist E2E image
+ - name: Build ShowProcesslist E2E Image
run: ./mvnw -B clean install -am -pl
test/e2e/operation/showprocesslist -Pit.env.docker -DskipTests
- name: Setup JDK 8 for Test
uses: actions/setup-java@v3
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
index dbc99c9b6ce..73dfe5430ca 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/env/ShowProcessListEnvironment.java
@@ -45,7 +45,7 @@ public final class ShowProcessListEnvironment {
private ShowProcessListEnvironment() {
props = loadProperties();
- runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.run.modes"));
+ runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.run.modes",
"Standalone, Cluster"));
itEnvType =
ShowProcessListEnvTypeEnum.valueOf(props.getProperty("it.env.type",
ShowProcessListEnvTypeEnum.NONE.name()).toUpperCase());
scenarios = getScenarios(props);
governanceCenters =
Splitter.on(",").trimResults().splitToList(props.getProperty("it.governance.centers"));
