Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit 41ab62c

Browse files
committed
fix jdk17 ci test
1 parent 4d39f75 commit 41ab62c

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

.github/workflows/serverless_runtime_release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
run: |
3535
serverless_runtime_version=`egrep "<revision.default>([^<]+)</revision.default>" sofa-serverless-runtime/pom.xml |awk -F "revision.default>|</revision.default" '{print $2}'`
3636
echo "升级sofa-runtime version to $serverless_runtime_version"
37-
for testsample in `find samples -name "*-samples"`;do sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g" $testsample/pom.xml ;done
37+
for testsample in `find samples -name "*[^3|^dubbo]-samples"`;do sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g" $testsample/pom.xml ;done
38+
for testsample in `find samples -name "*[3]-samples"`;do sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version-jdk17<\/sofa.serverless.runtime.version>/g" $testsample/pom.xml ;done
3839
for testsample in `find samples -name "*[^dubbo]-samples"`;do if cat $testsample/pom.xml |grep "<sofa.serverless.runtime.version>"|grep $serverless_runtime_version;then echo "版本校验通过";else echo "版本校验失败";exit 1;fi;done
3940
4041
- name: Test Env prepare
@@ -61,6 +62,10 @@ jobs:
6162
distribution: 'temurin'
6263
cache: maven
6364

65+
- name: Build with Maven
66+
working-directory: sofa-serverless-runtime
67+
run: mvn clean install -P17-release -DskipTests -B -U -e && sh ./check_format.sh
68+
6469
- name: Run jdk17 serverless runtime test
6570
run: |
6671
set -e

.github/workflows/serverless_runtime_snapshot.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
run: |
3535
serverless_runtime_version=`egrep "<revision.default>([^<]+)</revision.default>" sofa-serverless-runtime/pom.xml |awk -F "revision.default>|</revision.default" '{print $2}'`
3636
echo "升级sofa-runtime version to $serverless_runtime_version"
37-
for testsample in `find samples -name "*-samples"`;do sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g" $testsample/pom.xml ;done
37+
for testsample in `find samples -name "*[^3|^dubbo]-samples"`;do sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g" $testsample/pom.xml ;done
38+
for testsample in `find samples -name "*[3]-samples"`;do sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version-jdk17<\/sofa.serverless.runtime.version>/g" $testsample/pom.xml ;done
3839
for testsample in `find samples -name "*[^dubbo]-samples"`;do if cat $testsample/pom.xml |grep "<sofa.serverless.runtime.version>"|grep $serverless_runtime_version;then echo "版本校验通过";else echo "版本校验失败";exit 1;fi;done
3940
4041
- name: Test Env prepare
@@ -49,10 +50,10 @@ jobs:
4950
sudo systemctl start redis-server
5051
sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl
5152
52-
- name: Run jdk8 serverless runtime test
53-
run: |
54-
set -e
55-
bash .github/workflows/ccbin/start.sh jdk8
53+
# - name: Run jdk8 serverless runtime test
54+
# run: |
55+
# set -e
56+
# bash .github/workflows/ccbin/start.sh jdk8
5657

5758
- name: Set up JDK 17
5859
uses: actions/setup-java@v3
@@ -61,6 +62,10 @@ jobs:
6162
distribution: 'temurin'
6263
cache: maven
6364

65+
- name: Build with Maven
66+
working-directory: sofa-serverless-runtime
67+
run: mvn clean install -P17-release -DskipTests -B -U -e
68+
6469
- name: Run jdk17 serverless runtime test
6570
run: |
6671
set -e

samples/springboot3-samples/db/mybatis/base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<groupId>com.alipay.sofa.serverless</groupId>
6969
<artifactId>sofa-serverless-base-starter</artifactId>
7070
<!-- 以上版本支持springboot3 -->
71-
<version>0.5.3-jdk17</version>
71+
<version>${sofa.serverless.runtime.version}</version>
7272
</dependency>
7373

7474
<dependency>

samples/springboot3-samples/logging/log4j2/base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<groupId>com.alipay.sofa.serverless</groupId>
3232
<artifactId>sofa-serverless-base-starter</artifactId>
3333
<!-- 以上版本支持springboot3 -->
34-
<version>0.5.3-jdk17</version>
34+
<version>${sofa.serverless.runtime.version}</version>
3535
</dependency>
3636

3737
<dependency>

samples/springboot3-samples/msg/kafka/base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<groupId>com.alipay.sofa.serverless</groupId>
4848
<artifactId>sofa-serverless-base-starter</artifactId>
4949
<!-- 以上版本支持springboot3 -->
50-
<version>0.5.3-jdk17</version>
50+
<version>${sofa.serverless.runtime.version}</version>
5151
</dependency>
5252

5353
<dependency>

samples/springboot3-samples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<spring.boot.version>3.0.9</spring.boot.version>
2222
<java.version>17</java.version>
2323
<sofa.ark.version>3.0.1</sofa.ark.version>
24-
<sofa.serverless.runtime.version>0.5.3-jdk17</sofa.serverless.runtime.version>
24+
<sofa.serverless.runtime.version>0.5.4-jdk17</sofa.serverless.runtime.version>
2525
<disruptor.version>3.4.2</disruptor.version>
2626
<os.plugin.version>1.7.1</os.plugin.version>
2727
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>

samples/springboot3-samples/web/tomcat/base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<groupId>com.alipay.sofa.serverless</groupId>
3737
<artifactId>sofa-serverless-base-starter</artifactId>
3838
<!-- 以上版本支持springboot3 -->
39-
<version>0.5.3-jdk17</version>
39+
<version>${sofa.serverless.runtime.version}</version>
4040
</dependency>
4141
<!-- end 动态模块相关依赖 -->
4242

0 commit comments

Comments
 (0)