You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/08/27 02:12:45 UTC
[skywalking-java] branch ci updated (70a497a -> 6d41298)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch ci
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.
discard 70a497a Fix wrong cache key and clean up CI settings
new 6d41298 Fix wrong cache key and clean up CI settings
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (70a497a)
\
N -- N -- N refs/heads/ci (6d41298)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking-java] 01/01: Fix wrong cache key and clean up CI
settings
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch ci
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 6d412986a2aa5f6f7f4cb27ba8e54f6750bac2e3
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Aug 27 10:11:09 2021 +0800
Fix wrong cache key and clean up CI settings
---
.github/workflows/ci.yaml | 7 +++++--
.github/workflows/codeql.yaml | 4 ++++
.github/workflows/plugins-jdk14-test.0.yaml | 6 ------
.github/workflows/plugins-test.0.yaml | 6 ------
.github/workflows/plugins-test.1.yaml | 6 ------
.github/workflows/plugins-test.2.yaml | 6 ------
.github/workflows/plugins-test.3.yaml | 6 ------
7 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 893a4fa..7fa3b3a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,6 +20,9 @@ on:
pull_request:
schedule:
- cron: '0 18 * * *' # TimeZone: UTC 0
+ push:
+ branches:
+ - ci
concurrency:
group: ci-it-${{ github.event.pull_request.number || github.ref }}
@@ -27,7 +30,7 @@ concurrency:
jobs:
matrix:
- name: ${{ matrix.os }} - ${{ matrix.java-version }}
+ name: Java ${{ matrix.java-version }} / ${{ matrix.os }}
if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking-java') || (github.event_name != 'schedule')
runs-on: ${{ matrix.os }}-latest
timeout-minutes: 60
@@ -53,7 +56,7 @@ jobs:
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-ci-${{ matrix.os }}
- restore-keys: ${{ runner.os }}-maven-${{ matrix.os }}
+ restore-keys: ${{ runner.os }}-maven-ci-${{ matrix.os }}
- uses: actions/setup-java@v2
with:
distribution: adopt
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 6b093f6..10e029e 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -19,8 +19,12 @@ name: "CodeQL"
on:
push:
branches: [ 'main' ]
+ paths:
+ - '**/*.java'
pull_request:
branches: [ 'main' ]
+ paths:
+ - '**/*.java'
schedule:
- cron: '28 3 * * *'
diff --git a/.github/workflows/plugins-jdk14-test.0.yaml b/.github/workflows/plugins-jdk14-test.0.yaml
index 8e2bcfa..83869f4 100644
--- a/.github/workflows/plugins-jdk14-test.0.yaml
+++ b/.github/workflows/plugins-jdk14-test.0.yaml
@@ -26,12 +26,6 @@ on:
- 'apm-sniffer/**'
- 'test/plugin/**'
- '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- '!**.md'
concurrency:
diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml
index 4cd2335..9590441 100644
--- a/.github/workflows/plugins-test.0.yaml
+++ b/.github/workflows/plugins-test.0.yaml
@@ -26,12 +26,6 @@ on:
- 'apm-sniffer/**'
- 'test/plugin/**'
- '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- '!**.md'
concurrency:
diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml
index b63deba..efc49c1 100644
--- a/.github/workflows/plugins-test.1.yaml
+++ b/.github/workflows/plugins-test.1.yaml
@@ -26,12 +26,6 @@ on:
- 'apm-sniffer/**'
- 'test/plugin/**'
- '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- '!**.md'
concurrency:
diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml
index 96f052f..9500881 100644
--- a/.github/workflows/plugins-test.2.yaml
+++ b/.github/workflows/plugins-test.2.yaml
@@ -26,12 +26,6 @@ on:
- 'apm-sniffer/**'
- 'test/plugin/**'
- '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- '!**.md'
concurrency:
diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml
index 8dd1cc4..c7a7dc4 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -26,12 +26,6 @@ on:
- 'apm-sniffer/**'
- 'test/plugin/**'
- '**/pom.xml'
- - '!test/e2e/**'
- - '!apm-webapp/**'
- - '!apm-dist/**'
- - '!apm-dist-es7/**'
- - '!apm-docker/**'
- - '!oap-server/**'
- '!**.md'
concurrency: