kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CI] set up Java explicitly and use the built-in cache mechanism (#8851)

This commit is contained in:
kezhenxu94 2022-04-11 18:55:39 +08:00 committed by GitHub
parent 9386375492
commit e38f25e28b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.github/workflows/skywalking.yaml vendored
View File

@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Check license header
@ -59,7 +59,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Check code style
@ -88,15 +88,14 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Cache maven repository
uses: actions/cache@v2
- uses: actions/setup-java@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
distribution: 'temurin'
java-version: '8'
cache: 'maven'
- name: Build distribution tar
run: |
./mvnw clean install -B -q \
@ -119,7 +118,7 @@ jobs:
matrix:
java-version: [ 8, 11, 17 ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v2
@ -152,15 +151,14 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Cache maven repository
uses: actions/cache@v2
- uses: actions/setup-java@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
distribution: 'temurin'
java-version: '8'
cache: 'maven'
- uses: actions/download-artifact@v2
with:
name: dist
@ -182,7 +180,7 @@ jobs:
- os: ubuntu
java-version: 11
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Cache maven repository
@ -208,7 +206,7 @@ jobs:
matrix:
java-version: [ 8, 11 ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- name: Cache maven repository
@ -454,7 +452,7 @@ jobs:
- name: So11y
config: test/e2e-v2/cases/so11y/e2e.yaml
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v2
@ -491,7 +489,7 @@ jobs:
analyzer: [ k8s-mesh, mx-mesh ]
istio_version: [ 1.7.1, 1.8.2, 1.9.1, 1.10.3, 1.11.4, 1.12.0, 1.13.1 ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v2
@ -524,7 +522,7 @@ jobs:
matrix:
java-version: [ 8, 11, 17 ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v2

4
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/KubernetesNodeRegistry.java
View File

@ -110,7 +110,7 @@ public final class KubernetesNodeRegistry implements ResourceEventHandler<V1Node
forEachAddress(node, nodeIPs::remove);
}
void forEachAddress(final V1Node node,
public void forEachAddress(final V1Node node,
final Consumer<String> consume) {
Optional.ofNullable(node)
.map(V1Node::getStatus)
@ -123,7 +123,7 @@ public final class KubernetesNodeRegistry implements ResourceEventHandler<V1Node
);
}
boolean isNode(final String ip) {
public boolean isNode(final String ip) {
return nodeIPs.contains(ip);
}
}

2
tools/dependencies/check-LICENSE.sh
View File

@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
set -e
set -ex
tar -zxf dist/apache-skywalking-apm-bin.tar.gz -C dist