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

Commit 610e30a

Browse files
lvjing2lvjing2
authored
Merge pull request #350 from sofastack/remove-jdk17
Remove jdk17 gitflow
2 parents 7139ede + c120035 commit 610e30a

File tree

5 files changed

+14
-294
lines changed

5 files changed

+14
-294
lines changed

‎.github/workflows/arklet_cd_test.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,3 @@ jobs:
5454
run: |
5555
set -e
5656
bash samples/ccbin/start.sh jdk8
57-
58-
- name: Set up JDK 17
59-
uses: actions/setup-java@v3
60-
with:
61-
java-version: '17'
62-
distribution: 'temurin'
63-
cache: maven
64-
65-
- name: Run jdk17 serverless runtime test
66-
run: |
67-
set -e
68-
bash samples/ccbin/start.sh jdk17

‎.github/workflows/arklet_unit_test.yml‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,9 @@ jobs:
3737
cache: maven
3838

3939
- name: Test
40-
run: mvn clean install -DskipTests -P8-release -Dmaven.javadoc.skip=true -B -U
40+
run: mvn clean install -DskipTests -Dmaven.javadoc.skip=true -B -U
4141
&& sh ./check_format.sh
42-
&& mvn test -P8-release
42+
&& mvn test
4343

4444
- name: upload coverage reports to Codecov with github action
45-
uses: codecov/codecov-action@v3
46-
47-
unit-test-for-jdk17:
48-
runs-on: ubuntu-latest
49-
steps:
50-
- uses: actions/checkout@v3
51-
- name: Setup Java JDK
52-
uses: actions/setup-java@v3
53-
with:
54-
distribution: adopt
55-
java-version: 17
56-
cache: maven
57-
58-
- name: Test
59-
run: mvn clean install -DskipTests -P17-release -Dmaven.javadoc.skip=true -B -U
60-
&& sh ./check_format.sh
61-
&& mvn test -P17-release
62-
63-
- name: upload coverage reports to Codecov with github action
64-
uses: codecov/codecov-action@v3
45+
uses: codecov/codecov-action@v3

‎.github/workflows/serverless_runtime_release.yml‎

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
cache: maven
2323
- name: Build with Maven
2424
working-directory: sofa-serverless-runtime
25-
run: mvn clean install -P8-release -DskipTests -B -U -e && sh ./check_format.sh
25+
run: mvn clean install -DskipTests -B -U -e && sh ./check_format.sh
2626

2727
- name: Set up Docker
2828
uses: docker/metadata-action@v3
@@ -32,44 +32,27 @@ jobs:
3232
3333
- name: get sofa-runtime version & update sofa-runtime version for all test sample app
3434
run: |
35-
serverless_runtime_version=`egrep "<revision.default>([^<]+)</revision.default>" sofa-serverless-runtime/pom.xml |awk -F "revision.default>|</revision.default" '{print $2}'`
35+
serverless_runtime_version=$(find sofa-serverless-runtime/sofa-serverless-common -name "*.jar" |grep -v source |sed "s/.*sofa-serverless-common-\(.*\).jar/\1/")
3636
echo "升级sofa-runtime version to $serverless_runtime_version"
3737
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
39-
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
38+
for testsample in `find samples -name "*[^3|^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
4039
4140
- name: Test Env prepare
4241
run: |
4342
sudo apt-get update >>/tmp/envprepare.out
4443
sudo apt-get install -y expect >>/tmp/envprepare.out
45-
docker pull mongo:7.0.2-jammy
44+
docker pull mongo:7.0.2-jammy
4645
docker run --name mongodb -d -p 27017:27017 -v /home/runner/work/data:/data/db mongo:7.0.2-jammy
4746
docker pull zookeeper:3.9.0
4847
docker run -p 2181:2181 -it --name zookeeper --restart always -d zookeeper:3.9.0
4948
sudo apt-get install redis-server -y
5049
sudo systemctl start redis-server
51-
sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl
50+
sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl
5251
5352
- name: Run jdk8 serverless runtime test
5453
run: |
5554
set -e
56-
bash samples/ccbin/start.sh jdk8
57-
58-
- name: Set up JDK 17
59-
uses: actions/setup-java@v3
60-
with:
61-
java-version: '17'
62-
distribution: 'temurin'
63-
cache: maven
64-
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-
69-
- name: Run jdk17 serverless runtime test
70-
run: |
71-
set -e
72-
bash samples/ccbin/start.sh jdk17
55+
bash .github/workflows/ccbin/start.sh jdk8
7356
7457
release_for_jdk8:
7558
needs: build_and_test
@@ -88,30 +71,7 @@ jobs:
8871
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
8972
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
9073
- name: Build with Maven
91-
run: mvn --batch-mode deploy -DskipTests -Prelease,8-release
92-
working-directory: sofa-serverless-runtime
93-
env:
94-
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
95-
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
96-
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
97-
release_for_jdk17:
98-
needs: build_and_test
99-
runs-on: ubuntu-latest
100-
steps:
101-
- uses: actions/checkout@v3
102-
- name: Set up JDK 17
103-
uses: actions/setup-java@v3
104-
with:
105-
java-version: '17'
106-
distribution: 'temurin'
107-
cache: maven
108-
server-id: ossrh
109-
server-username: MAVEN_USERNAME
110-
server-password: MAVEN_PASSWORD
111-
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
112-
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
113-
- name: Build with Maven
114-
run: mvn --batch-mode deploy -DskipTests -Prelease,17-release
74+
run: mvn --batch-mode deploy -DskipTests -Prelease
11575
working-directory: sofa-serverless-runtime
11676
env:
11777
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

‎.github/workflows/serverless_runtime_snapshot.yml‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎sofa-serverless-runtime/pom.xml‎

Lines changed: 4 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@
99
<packaging>pom</packaging>
1010

1111
<properties>
12-
<!-- JDK 17 打包如下：
13-
1. 切换到JDK 17
14-
2. 修改 sofa.ark.version.base 和 revision.default 中的 "数字" 版本号
15-
3. 开始打包，将所有打出的包都上传-->
16-
<sofa.ark.version.jdk17>3.0.1</sofa.ark.version.jdk17>
17-
<sofa.ark.version.jdk8>2.2.4</sofa.ark.version.jdk8>
18-
<spring.boot.version.jdk8>2.7.15</spring.boot.version.jdk8>
19-
<spring.boot.version.jdk17>3.0.9</spring.boot.version.jdk17>
20-
<logback.core.default>1.2.9</logback.core.default>
21-
<revision.default>0.5.5</revision.default>
12+
<sofa.ark.version>2.2.4</sofa.ark.version>
13+
<spring.boot.version>2.7.15</spring.boot.version>
14+
<logback.core>1.2.9</logback.core>
15+
<revision>0.5.5-SNAPSHOT</revision>
2216
<project.encoding>UTF-8</project.encoding>
2317
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2418
<java.version>1.8</java.version>
@@ -481,83 +475,6 @@
481475

482476

483477
<profiles>
484-
<!--
485-
jdk17 打出来的 snapshot 版本
486-
举例：
487-
打出来的包为 0.5.3-jdk17-SNAPSHOT
488-
使用sofa-ark的包 3.0.0
489-
-->
490-
<profile>
491-
<id>17-snapshot</id>
492-
<properties>
493-
<logback.core>1.3.5</logback.core>
494-
<revision>${revision.default}-jdk17-SNAPSHOT</revision>
495-
<sofa.ark.version>${sofa.ark.version.jdk17}</sofa.ark.version>
496-
<spring.boot.version>${spring.boot.version.jdk17}</spring.boot.version>
497-
</properties>
498-
<activation>
499-
<jdk>17</jdk>
500-
</activation>
501-
</profile>
502-
<!--
503-
jdk17 打出来的 release 版本
504-
举例：
505-
打出来的包为 0.5.3-jdk17
506-
使用sofa-ark的包 3.0.0
507-
-->
508-
<profile>
509-
<id>17-release</id>
510-
<properties>
511-
<logback.core>1.3.5</logback.core>
512-
<revision>${revision.default}-jdk17</revision>
513-
<sofa.ark.version>${sofa.ark.version.jdk17}</sofa.ark.version>
514-
<spring.boot.version>${spring.boot.version.jdk17}</spring.boot.version>
515-
</properties>
516-
<activation>
517-
<jdk>17</jdk>
518-
</activation>
519-
</profile>
520-
521-
<!--
522-
jdk8 打出来的 snapshot 版本
523-
举例：
524-
打出来的包为 0.5.3-SNAPSHOT
525-
使用sofa-ark的包 2.2.4
526-
使用sofa-ark starter 的包 2.2.4
527-
-->
528-
<profile>
529-
<id>8-snapshot</id>
530-
<properties>
531-
<logback.core>1.2.9</logback.core>
532-
<revision>${revision.default}-SNAPSHOT</revision>
533-
<sofa.ark.version>${sofa.ark.version.jdk8}</sofa.ark.version>
534-
<spring.boot.version>${spring.boot.version.jdk8}</spring.boot.version>
535-
</properties>
536-
<activation>
537-
<jdk>8</jdk>
538-
</activation>
539-
</profile>
540-
541-
<!--
542-
jdk8 打出来的 release 版本
543-
举例：
544-
打出来的包为 0.5.3
545-
使用sofa-ark的包 2.2.4
546-
使用sofa-ark starter 的包 2.2.4
547-
-->
548-
<profile>
549-
<id>8-release</id>
550-
<properties>
551-
<logback.core>1.2.9</logback.core>
552-
<revision>${revision.default}</revision>
553-
<sofa.ark.version>${sofa.ark.version.jdk8}</sofa.ark.version>
554-
<spring.boot.version>${spring.boot.version.jdk8}</spring.boot.version>
555-
</properties>
556-
<activation>
557-
<jdk>8</jdk>
558-
</activation>
559-
</profile>
560-
561478
<profile>
562479
<id>release</id>
563480
<build>
@@ -700,12 +617,6 @@
700617
<activation>
701618
<activeByDefault>true</activeByDefault>
702619
</activation>
703-
<properties>
704-
<logback.core>1.2.9</logback.core>
705-
<revision>${revision.default}</revision>
706-
<sofa.ark.version>${sofa.ark.version.jdk8}</sofa.ark.version>
707-
<spring.boot.version>${spring.boot.version.jdk8}</spring.boot.version>
708-
</properties>
709620
<repositories>
710621
<repository>
711622
<snapshots>

0 commit comments

Comments
 (0)