You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/10/08 16:48:57 UTC
[shardingsphere] branch master updated: Refactor : upgrade all java set up in workflow (#21403)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 f0fdc35fe55 Refactor : upgrade all java set up in workflow (#21403)
f0fdc35fe55 is described below
commit f0fdc35fe55395010ee44c20ab43f9dc3d2eda89
Author: 孙念君 Nianjun Sun <su...@sphere-ex.com>
AuthorDate: Sun Oct 9 00:48:48 2022 +0800
Refactor : upgrade all java set up in workflow (#21403)
* Refactor : rename the matrix
* Refactor : adjust the maven resolve ranges order and upgrade the setup JDK tool
* Refactor : upgrade all setup-java tool version
Co-authored-by: 孙念君 Nianjun Sun <su...@apache.com>
---
.github/workflows/ci.yml | 14 +++++-----
.github/workflows/docker-release.yml | 2 +-
.github/workflows/it.yml | 30 +++++++++++-----------
.github/workflows/nightly-build.yml | 2 +-
.github/workflows/nightly-ci.yml | 8 +++---
.github/workflows/nightly-it-example-generator.yml | 4 +--
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b7d44eafa6..4b6cfc3a1cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,27 +54,27 @@ env:
jobs:
ci:
- name: CI - JDK ${{ matrix.java_version }} on ${{ matrix.os }}
+ name: CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 60
strategy:
matrix:
- java_version: [ 8, 19 ]
+ java-version: [ 8, 19 ]
os: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: ${{ matrix.java_version }}
- - name: Maven resolve ranges
- run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
+ java-version: ${{ matrix.java-version }}
- uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
+ - name: Maven resolve ranges
+ run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build prod with Maven
run: ./mvnw -B -ntp clean install -Dmaven.javadoc.skip=true -Djacoco.skip=true
- name: Build examples with Maven
@@ -93,7 +93,7 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 124ba1baa14..6b6dd413357 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -44,7 +44,7 @@ jobs:
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index 0d232da67c2..cc6050371bd 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -69,18 +69,18 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- - name: Maven resolve ranges
- run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: '8'
- uses: actions/cache@v2
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
restore-keys: |
${{ runner.os }}-maven-
- - uses: actions/setup-java@v2
- with:
- distribution: 'temurin'
- java-version: 8
+ - name: Maven resolve ranges
+ run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build IT image
run: ./mvnw -B clean install -am -pl test/integration-test/test-suite -Pit.env.docker -DskipTests -Dspotless.apply.skip=true
- name: Verify Suite CI Run
@@ -109,7 +109,7 @@ jobs:
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
@@ -146,7 +146,7 @@ jobs:
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
@@ -183,7 +183,7 @@ jobs:
with:
path: ~/.m2/repository
key: shardingsphere-it-cache-${{ github.sha }}
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
@@ -204,18 +204,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - name: Maven Resolve Ranges
- run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
+ - uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: '8'
- uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - uses: actions/setup-java@v2
- with:
- distribution: 'temurin'
- java-version: 8
+ - name: Maven resolve ranges
+ run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build Project
run: ./mvnw -B clean install -DskipITs -DskipTests
- name: Verify
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 22b98d54d4e..71055531f6e 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -37,7 +37,7 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/checkout@v2
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
index 8d7802bb686..ce5feaa6436 100644
--- a/.github/workflows/nightly-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -27,23 +27,23 @@ env:
jobs:
ci:
if: github.repository == 'apache/shardingsphere'
- name: CI - JDK ${{ matrix.java_version }} on ${{ matrix.os }}
+ name: CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
- java_version: [ 8, 17, 19 ]
+ java-version: [ 8, 17, 19 ]
steps:
- name: Support longpaths in Windows
if: matrix.os == 'windows-latest'
run: git config --global core.longpaths true
- uses: actions/checkout@v3
- - uses: actions/setup-java@v2
+ - uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: ${{ matrix.java_version }}
+ java-version: ${{ matrix.java-version }}
- uses: actions/cache@v2
with:
path: ~/.m2/repository
diff --git a/.github/workflows/nightly-it-example-generator.yml b/.github/workflows/nightly-it-example-generator.yml
index 5672556bda5..9b196fd2efc 100644
--- a/.github/workflows/nightly-it-example-generator.yml
+++ b/.github/workflows/nightly-it-example-generator.yml
@@ -52,8 +52,6 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- - name: Maven resolve ranges
- run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
@@ -64,6 +62,8 @@ jobs:
key: shardingsphere-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
+ - name: Maven resolve ranges
+ run: ./mvnw versions:resolve-ranges -ntp -Dincludes='org.springframework:*,org.springframework.boot:*'
- name: Build with Maven
run: ./mvnw -B -ntp clean install -Dmaven.javadoc.skip=true -DskipITs -DskipTests -Dspotless.apply.skip=true
- name: Prepare environments