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/04 07:36:25 UTC
[shardingsphere] branch master updated: Refactor : combine the duplicated license check plugin (#21338)
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 589d28da302 Refactor : combine the duplicated license check plugin (#21338)
589d28da302 is described below
commit 589d28da30221087f5c2aea7d5abd5fdba74ee5a
Author: 孙念君 Nianjun Sun <su...@sphere-ex.com>
AuthorDate: Tue Oct 4 15:36:16 2022 +0800
Refactor : combine the duplicated license check plugin (#21338)
* Refactor : combine duplicated license check action
* Refactor : rename the action
* Remove : remove the header
* Add : add header for class
* Refactor : refactor the name of all workflow and transfer some workflow into daily
Co-authored-by: 孙念君 Nianjun Sun <su...@apache.com>
---
.github/workflows/check-license.yml | 36 -------------
...-check.yml => checkstyle-and-license-check.yml} | 20 +++++---
.github/workflows/{ci-daily.yml => daily-ci.yml} | 2 +-
...enerator.yml => daily-example-generator-it.yml} | 16 ++----
.../{native.yml => daily-graalvm-image.yml} | 4 +-
...ghtlies-rsync.yml => daily-nightlies-rsync.yml} | 4 +-
.github/workflows/docker-per-commit.yaml | 2 +-
.github/workflows/docker.yml | 2 +-
.github/workflows/it-scaling.yml | 2 +-
.github/workflows/it-transaction.yml | 2 +-
pom.xml | 60 ----------------------
11 files changed, 25 insertions(+), 125 deletions(-)
diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml
deleted file mode 100644
index 1c84758ba28..00000000000
--- a/.github/workflows/check-license.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name: Check:License Check
-
-on:
- pull_request:
- branches: [ master ]
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-jobs:
- check-license:
- name: check-license
- timeout-minutes: 10
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: Check License Header
- uses: apache/skywalking-eyes@v0.3.0
diff --git a/.github/workflows/checkstyle-and-rat-check.yml b/.github/workflows/checkstyle-and-license-check.yml
similarity index 82%
rename from .github/workflows/checkstyle-and-rat-check.yml
rename to .github/workflows/checkstyle-and-license-check.yml
index 4f7a031a0c6..1ac3070f4f6 100644
--- a/.github/workflows/checkstyle-and-rat-check.yml
+++ b/.github/workflows/checkstyle-and-license-check.yml
@@ -18,7 +18,7 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-name: Check:Checkstyle and Apache Rat Check
+name: Check - Checkstyle and License Check
on:
push:
@@ -26,7 +26,7 @@ on:
paths:
- '**/src/main/**'
- '**/src/test/**'
- - '.github/workflows/checkstyle-and-rat-check.yml'
+ - '.github/workflows/checkstyle-and-license-check.yml'
- 'examples/shardingsphere-example-generator/**'
- '!examples/**'
- '!*.md'
@@ -35,7 +35,7 @@ on:
paths:
- '**/src/main/**'
- '**/src/test/**'
- - '.github/workflows/checkstyle-and-rat-check.yml'
+ - '.github/workflows/checkstyle-and-license-check.yml'
- 'examples/shardingsphere-example-generator/**'
- '!examples/**'
- '!*.md'
@@ -45,7 +45,7 @@ concurrency:
cancel-in-progress: true
jobs:
- checkstyle-and-apache-rat:
+ checkstyle-check:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
@@ -59,6 +59,12 @@ jobs:
${{ runner.os }}-maven-
- name: Run Checkstyle
run: ./mvnw checkstyle:check -T1C
- - name: Run Apache Rat
- if: github.repository == 'apache/shardingsphere'
- run: ./mvnw apache-rat:check -T1C
+
+ check-license:
+ name: license-check
+ timeout-minutes: 10
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Check License Header
+ uses: apache/skywalking-eyes@v0.4.0
diff --git a/.github/workflows/ci-daily.yml b/.github/workflows/daily-ci.yml
similarity index 98%
rename from .github/workflows/ci-daily.yml
rename to .github/workflows/daily-ci.yml
index d41f6d71f74..3ceb5056913 100644
--- a/.github/workflows/ci-daily.yml
+++ b/.github/workflows/daily-ci.yml
@@ -18,7 +18,7 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-name: Continuous Integration:Daily
+name: Daily - Continuous Integration
on:
schedule:
diff --git a/.github/workflows/it-example-generator.yml b/.github/workflows/daily-example-generator-it.yml
similarity index 93%
rename from .github/workflows/it-example-generator.yml
rename to .github/workflows/daily-example-generator-it.yml
index 30f599d23ad..631255fec56 100644
--- a/.github/workflows/it-example-generator.yml
+++ b/.github/workflows/daily-example-generator-it.yml
@@ -18,21 +18,11 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-name: Auto Generator Example Test
+name: Daily - Example Generator IT
on:
- push:
- branches: [ master, dev ]
- paths:
- - '.github/workflows/it-example-generator.yml'
- - '**/pom.xml'
- - '**/src/main/**'
- - 'examples/shardingsphere-example-generator/**'
- - '!shardingsphere-distribution/**'
- - '!shardingsphere-test/**'
- - '!*.md'
- pull_request:
- branches: [ master ]
+ schedule:
+ - cron: '0 19 */1 * *' # once a day. UTC time
env:
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Drat.skip=true -Dcheckstyle.skip=true
diff --git a/.github/workflows/native.yml b/.github/workflows/daily-graalvm-image.yml
similarity index 95%
rename from .github/workflows/native.yml
rename to .github/workflows/daily-graalvm-image.yml
index 16470e1e4b2..a3ab12e4772 100644
--- a/.github/workflows/native.yml
+++ b/.github/workflows/daily-graalvm-image.yml
@@ -14,11 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: GraalVM Native Image Daily Continuous Integration
+name: Daily - GraalVM Native Image CI
on:
schedule:
- - cron: '0 0 * * *'
+ - cron: '0 20 */1 * *' # once a day. UTC time
env:
HUB: ghcr.io/apache/shardingsphere
diff --git a/.github/workflows/nightlies-rsync.yml b/.github/workflows/daily-nightlies-rsync.yml
similarity index 96%
rename from .github/workflows/nightlies-rsync.yml
rename to .github/workflows/daily-nightlies-rsync.yml
index a2d189eadbc..a1c76475812 100644
--- a/.github/workflows/nightlies-rsync.yml
+++ b/.github/workflows/daily-nightlies-rsync.yml
@@ -15,11 +15,11 @@
# limitations under the License.
#
-name: Build:Nightly Builds
+name: Daily - Nightly Builds
on:
schedule:
- - cron: '0 19 */1 * *' # once a day. UTC time
+ - cron: '0 21 */1 * *' # once a day. UTC time
env:
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Djacoco.skip=true -DskipITs -DskipTests -Dspotless.apply.skip=true
diff --git a/.github/workflows/docker-per-commit.yaml b/.github/workflows/docker-per-commit.yaml
index 655e6c651f6..2b1d3c5b019 100644
--- a/.github/workflows/docker-per-commit.yaml
+++ b/.github/workflows/docker-per-commit.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: Docker:Publish Image per Commit
+name: Docker - Publish Image per Commit
on:
push:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 619ca49e5d5..29354ec93b0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Docker:Deploy Docker Image
+name: Docker - Deploy Docker Image
on:
release:
diff --git a/.github/workflows/it-scaling.yml b/.github/workflows/it-scaling.yml
index 9bca8436209..b1cfd864413 100644
--- a/.github/workflows/it-scaling.yml
+++ b/.github/workflows/it-scaling.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Integration Test:Scaling
+name: Integration Test - Scaling
on:
push:
diff --git a/.github/workflows/it-transaction.yml b/.github/workflows/it-transaction.yml
index e55818fa0b6..26cbcea66b9 100644
--- a/.github/workflows/it-transaction.yml
+++ b/.github/workflows/it-transaction.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: Integration Test:Transaction
+name: Integration Test - Transaction
on:
push:
diff --git a/pom.xml b/pom.xml
index 397a1b83cc3..ff8680abdbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,6 @@
<checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
<templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
- <apache-rat-plugin.version>0.14</apache-rat-plugin.version>
<freemarker.version>2.3.31</freemarker.version>
<spotless-maven-plugin.version>2.22.1</spotless-maven-plugin.version>
<caffeine.version>2.9.2</caffeine.version>
@@ -1116,65 +1115,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <configuration>
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/logs/**</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/*.tokens</exclude>
- <!-- IDE files -->
- <exclude>**/*.iml</exclude>
- <exclude>**/.idea/**</exclude>
- <exclude>**/*.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <!-- git files -->
- <exclude>**/.gitignore</exclude>
- <exclude>**/.gitmodules</exclude>
- <exclude>**/.git/**</exclude>
- <!-- CI files -->
- <exclude>**/.travis.yml</exclude>
- <exclude>**/.codecov.yml</exclude>
- <exclude>**/.mvn/jvm.config</exclude>
- <exclude>**/.mvn/wrapper/maven-wrapper.properties</exclude>
- <!-- GitHub files -->
- <exclude>**/.github/**</exclude>
- <!-- document files -->
- <exclude>**/*.md</exclude>
- <excldue>**/*.MD</excldue>
- <exclude>**/*.txt</exclude>
- <exclude>**/docs/**</exclude>
- <!-- UI files -->
- <exclude>**/.babelrc</exclude>
- <exclude>**/.editorconfig</exclude>
- <exclude>**/.eslintignore</exclude>
- <exclude>**/package.json</exclude>
- <exclude>**/assets/**</exclude>
- <exclude>**/dist/**</exclude>
- <exclude>**/etc/**</exclude>
- <exclude>**/node/**</exclude>
- <exclude>**/node_modules/**</exclude>
- <exclude>**/test/coverage/**</exclude>
- <exclude>**/package-lock.json</exclude>
- <!-- example files -->
- <exclude>/examples/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
<extensions>
<extension>