Skip to content

Commit 6b38c54

Browse files
committed
Update with latest JDK
1 parent b05f36d commit 6b38c54

File tree

2 files changed

+18
-25
lines changed

2 files changed

+18
-25
lines changed

Diff for: .github/workflows/maven.yml

+15-16
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: Maven Package
33

44
on:
55
push:
6-
schedule:
7-
- cron: '0 0 * * *'
86

97
jobs:
108
build:
@@ -15,13 +13,10 @@ jobs:
1513
matrix:
1614
include:
1715
- api: jdk
18-
test_jdk: jdk-crac
19-
build_jdk: jdk14-crac
16+
build_jdk: crac
2017
- api: javax
21-
test_jdk: javax-crac
22-
build_jdk: jdk14-crac
18+
build_jdk: crac
2319
- api: org
24-
test_jdk: jdk-crac
2520
build_jdk:
2621

2722
steps:
@@ -40,6 +35,8 @@ jobs:
4035
repository: CRaC/utils
4136
path: utils
4237

38+
- run: make -C utils
39+
4340
- name: Set up JDK 1.8
4441
uses: actions/setup-java@v1
4542
with:
@@ -53,19 +50,21 @@ jobs:
5350
5451
- name: Download JDK
5552
run: |
56-
utils/download-jdk.sh ${{ matrix.test_jdk }}
57-
sudo tar -axf jdk14-crac.tar.gz
53+
archive=$(utils/download-jdk.sh)
54+
sudo tar -axf $archive
55+
echo JDK=${archive%%.tar.gz} >> $GITHUB_ENV
5856
5957
- name: Use specific API
6058
if: matrix.api != 'jdk'
6159
run: |
6260
find -name '*.java' | xargs sed -i 's/jdk\.crac/${{ matrix.api }}.crac/g'
6361
git diff
6462
65-
- run: mvn -B package -P${{ matrix.api }}
66-
env:
67-
JAVA_HOME: ${{ matrix.build_jdk }}
68-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
- run: |
64+
if [ ${{ matrix.build_jdk }} = crac ]; then
65+
export JAVA_HOME=${{ env.JDK }}
66+
fi
67+
mvn -B package -P${{ matrix.api }}
6968
7069
- name: Test on Vanila JDK
7170
run: |
@@ -82,7 +81,7 @@ jobs:
8281
P=$(utils/start-bg.sh \
8382
-s "Server:main: Started" \
8483
-e exitcode \
85-
jdk14-crac/bin/java \
84+
${{ env.JDK }}/bin/java \
8685
-XX:CRaCCheckpointTo=cr \
8786
-XX:+UnlockDiagnosticVMOptions \
8887
-XX:+CRTraceStartupTime \
@@ -98,12 +97,12 @@ jobs:
9897
run: |
9998
P=$(utils/start-bg.sh \
10099
-s "restore-finish" \
101-
jdk14-crac/bin/java -XX:CRaCRestoreFrom=cr)
100+
${{ env.JDK }}/bin/java -XX:CRaCRestoreFrom=cr)
102101
curl localhost:8080 | grep "Hello World"
103102
utils/bench.sh http://localhost:8080
104103
kill $P
105104
106105
- name: Test C/RaC startup time
107106
run:
108-
timeout 3 bash -c "jdk14-crac/lib/javatime ; jdk14-crac/bin/java -XX:CRaCRestoreFrom=cr"
107+
timeout 3 bash -c "utils/lib/javatime ; ${{ env.JDK }}/bin/java -XX:CRaCRestoreFrom=cr"
109108
| utils/sel.awk -v from=prestart -v to=restore-finish

Diff for: pom.xml

+3-9
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,15 @@
5050
</profile>
5151
<profile>
5252
<id>org</id>
53-
<repositories>
54-
<repository>
55-
<id>github</id>
56-
<url>https://maven.pkg.github.com/CRaC/org.crac</url>
57-
</repository>
58-
</repositories>
5953
<properties>
6054
<maven.compiler.source>1.8</maven.compiler.source>
6155
<maven.compiler.target>1.8</maven.compiler.target>
6256
</properties>
6357
<dependencies>
6458
<dependency>
65-
<groupId>org.crac</groupId>
66-
<artifactId>crac</artifactId>
67-
<version>999-SNAPSHOT</version>
59+
<groupId>io.github.crac</groupId>
60+
<artifactId>org-crac</artifactId>
61+
<version>0.1.0</version>
6862
</dependency>
6963
</dependencies>
7064
</profile>

0 commit comments

Comments
 (0)