Skip to content

Commit ead34c5

Browse files
committed
Fix
1 parent 7969f05 commit ead34c5

File tree

3 files changed

+72
-0
lines changed

3 files changed

+72
-0
lines changed
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
name: Test
18+
19+
on:
20+
pull_request:
21+
paths:
22+
- '.github/workflows/plugins-*.yaml'
23+
- 'apm-application-toolkit/**'
24+
- 'apm-commons/**'
25+
- 'apm-protocol/**'
26+
- 'apm-sniffer/**'
27+
- 'test/plugin/**'
28+
- '**/pom.xml'
29+
- '!**.md'
30+
31+
concurrency:
32+
group: plugins-jdk25-1-${{ github.event.pull_request.number || github.ref }}
33+
cancel-in-progress: true
34+
35+
jobs:
36+
build:
37+
name: Build
38+
runs-on: ubuntu-latest
39+
timeout-minutes: 30
40+
steps:
41+
- uses: actions/checkout@v2
42+
with:
43+
submodules: true
44+
- name: Build
45+
uses: ./.github/actions/build
46+
with:
47+
base_image_java: eclipse-temurin:25-jdk
48+
base_image_tomcat: tomcat:10.1-jdk25-temurin
49+
50+
test:
51+
needs: [ build ]
52+
name: ${{ matrix.case }}-jdk25
53+
runs-on: ubuntu-latest
54+
timeout-minutes: 90
55+
strategy:
56+
matrix:
57+
case:
58+
- spring-6.x-scenario
59+
steps:
60+
- uses: actions/checkout@v2
61+
with:
62+
submodules: true
63+
- uses: actions/setup-java@v2
64+
with:
65+
distribution: 'temurin'
66+
java-version: '25'
67+
- name: Run Test
68+
uses: ./.github/actions/run
69+
with:
70+
test_case: ${{ matrix.case }}

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Release Notes.
2525
* Fix AbstractLogger replaceParam when the replaced string contains a replacement marker.
2626
* Bump up Lombok to v1.18.42 to adopt JDK25 compiling.
2727
* Add `eclipse-temurin:25-jre` as another base image.
28+
* Add JDK25 plugin tests for Spring 6.
2829

2930
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
3031

docs/en/setup/service-agent/java-agent/Plugin-test.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,7 @@ You can run `python3 tools/select-group.py` to see which file contains the least
682682

683683
If a test case required to run in JDK 17 environment, please add you test case into file `plugins-jdk17-test.<n>.yaml`.
684684
If a test case required to run in JDK 21 environment, please add you test case into file `plugins-jdk21-test.<n>.yaml`.
685+
If a test case required to run in JDK 25 environment, please add you test case into file `plugins-jdk25-test.<n>.yaml`.
685686

686687
```yaml
687688
jobs:

0 commit comments

Comments
 (0)