Skip to content

Commit 2ae5af9

Browse files
authored
[DE-761] fix native CI (#536)
* CI: native tests update * CI: truffle tests update * CI: native tests update * CI: native tests update * CI: native tests update * CI: native tests update * CI: native tests update
1 parent 501d5cc commit 2ae5af9

File tree

6 files changed

+31
-38
lines changed

6 files changed

+31
-38
lines changed

Diff for: .github/workflows/native.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
- docker.io/arangodb/enterprise:3.11.6
1818
topology:
1919
- single
20-
java-version:
21-
- 17
2220
module:
2321
- driver
2422
- integration-tests
@@ -27,10 +25,11 @@ jobs:
2725
- uses: actions/checkout@v2
2826
- uses: graalvm/setup-graalvm@v1
2927
with:
30-
version: 'latest'
31-
java-version: ${{matrix.java-version}}
28+
java-version: '21.0.1'
29+
distribution: 'graalvm'
30+
cache: 'maven'
31+
native-image-job-reports: 'true'
3232
github-token: ${{ secrets.GITHUB_TOKEN }}
33-
components: 'native-image,js'
3433
- name: Start Database
3534
run: ./docker/start_db.sh
3635
env:
@@ -56,8 +55,6 @@ jobs:
5655
- docker.io/arangodb/enterprise:3.11.6
5756
topology:
5857
- single
59-
java-version:
60-
- 17
6158
module:
6259
- driver
6360
- integration-tests
@@ -66,10 +63,11 @@ jobs:
6663
- uses: actions/checkout@v2
6764
- uses: graalvm/setup-graalvm@v1
6865
with:
69-
version: 'latest'
70-
java-version: ${{matrix.java-version}}
66+
java-version: '21.0.1'
67+
distribution: 'graalvm'
68+
cache: 'maven'
69+
native-image-job-reports: 'true'
7170
github-token: ${{ secrets.GITHUB_TOKEN }}
72-
components: 'native-image,js'
7371
- name: Start Database
7472
run: ./docker/start_db.sh
7573
env:

Diff for: .github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ jobs:
106106
- uses: actions/checkout@v2
107107
- uses: graalvm/setup-graalvm@v1
108108
with:
109-
version: 'latest'
110-
java-version: '17'
109+
java-version: '21.0.1'
110+
distribution: 'graalvm'
111+
cache: 'maven'
111112
github-token: ${{ secrets.GITHUB_TOKEN }}
112-
components: 'js'
113113
- name: Info
114114
run: mvn -version
115115
- name: Test

Diff for: driver/pom.xml

+19-20
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,6 @@
2222
</properties>
2323

2424
<profiles>
25-
<profile>
26-
<id>no-graalvm</id>
27-
<activation>
28-
<jdk>1.8</jdk>
29-
</activation>
30-
<build>
31-
<plugins>
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-compiler-plugin</artifactId>
35-
<version>3.11.0</version>
36-
<configuration>
37-
<testExcludes>
38-
<exclude>graalvm/UnicodeUtilsTest.java</exclude>
39-
</testExcludes>
40-
</configuration>
41-
</plugin>
42-
</plugins>
43-
</build>
44-
</profile>
4525
<profile>
4626
<id>static-code-analysis</id>
4727
<build>
@@ -189,6 +169,25 @@
189169
<version>${graalvm.version}</version>
190170
<scope>test</scope>
191171
</dependency>
172+
<dependency>
173+
<groupId>org.graalvm.js</groupId>
174+
<artifactId>js-language</artifactId>
175+
<version>${graalvm.version}</version>
176+
<scope>test</scope>
177+
</dependency>
178+
<dependency>
179+
<groupId>org.graalvm.polyglot</groupId>
180+
<artifactId>polyglot</artifactId>
181+
<version>${graalvm.version}</version>
182+
<scope>test</scope>
183+
</dependency>
184+
<dependency>
185+
<groupId>org.graalvm.polyglot</groupId>
186+
<artifactId>js</artifactId>
187+
<version>${graalvm.version}</version>
188+
<type>pom</type>
189+
<scope>test</scope>
190+
</dependency>
192191
<dependency>
193192
<groupId>io.smallrye.config</groupId>
194193
<artifactId>smallrye-config-core</artifactId>

Diff for: driver/src/test/java/helper/NativeImageHelper.java

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.net.URL;
1616
import java.util.Arrays;
1717
import java.util.Collection;
18-
import java.util.HashSet;
1918
import java.util.List;
2019
import java.util.stream.Stream;
2120

Diff for: driver/src/test/java/unicode/UnicodeUtilsTest.java

-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
import com.arangodb.util.TestUtils;
55
import com.arangodb.util.UnicodeUtils;
66
import org.graalvm.home.Version;
7-
import org.graalvm.nativeimage.ImageInfo;
87
import org.graalvm.polyglot.Context;
98
import org.graalvm.polyglot.Value;
109
import org.junit.jupiter.api.AfterAll;
1110
import org.junit.jupiter.api.BeforeAll;
1211
import org.junit.jupiter.api.Test;
1312

1413
import static org.assertj.core.api.Assertions.assertThat;
15-
import static org.junit.jupiter.api.Assumptions.assumeFalse;
1614
import static org.junit.jupiter.api.Assumptions.assumeTrue;
1715

1816

@@ -26,7 +24,6 @@ class UnicodeUtilsTest {
2624

2725
@BeforeAll
2826
static void beforeClass() {
29-
assumeFalse(ImageInfo.inImageCode(), "skipped in native mode");
3027
assumeTrue(Version.getCurrent().isRelease(), "This test requires GraalVM");
3128
context = Context.create();
3229
jsEncoder = context.eval("js", encodeFn);

Diff for: shaded/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.graalvm.sdk</groupId>
5151
<artifactId>graal-sdk</artifactId>
52-
<version>22.3.3</version>
52+
<version>${graalvm.version}</version>
5353
<scope>provided</scope>
5454
</dependency>
5555
</dependencies>

0 commit comments

Comments
 (0)