Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DE-761] fix native CI #536

Merged
merged 7 commits into from
Jan 16, 2024
Merged

[DE-761] fix native CI #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d88856a
CI: native tests update
rashtao Jan 16, 2024
eef8502
CI: truffle tests update
rashtao Jan 16, 2024
5da87e5
CI: native tests update
rashtao Jan 16, 2024
9d71895
CI: native tests update
rashtao Jan 16, 2024
b916ea6
CI: native tests update
rashtao Jan 16, 2024
77efdb4
CI: native tests update
rashtao Jan 16, 2024
ad8b706
CI: native tests update
rashtao Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions .github/workflows/native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
- docker.io/arangodb/enterprise:3.11.6
topology:
- single
java-version:
- 17
module:
- driver
- integration-tests
Expand All @@ -27,10 +25,11 @@ jobs:
- uses: actions/checkout@v2
- uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: ${{matrix.java-version}}
java-version: '21.0.1'
distribution: 'graalvm'
cache: 'maven'
native-image-job-reports: 'true'
github-token: ${{ secrets.GITHUB_TOKEN }}
components: 'native-image,js'
- name: Start Database
run: ./docker/start_db.sh
env:
Expand All @@ -56,8 +55,6 @@ jobs:
- docker.io/arangodb/enterprise:3.11.6
topology:
- single
java-version:
- 17
module:
- driver
- integration-tests
Expand All @@ -66,10 +63,11 @@ jobs:
- uses: actions/checkout@v2
- uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: ${{matrix.java-version}}
java-version: '21.0.1'
distribution: 'graalvm'
cache: 'maven'
native-image-job-reports: 'true'
github-token: ${{ secrets.GITHUB_TOKEN }}
components: 'native-image,js'
- name: Start Database
run: ./docker/start_db.sh
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ jobs:
- uses: actions/checkout@v2
- uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: '17'
java-version: '21.0.1'
distribution: 'graalvm'
cache: 'maven'
github-token: ${{ secrets.GITHUB_TOKEN }}
components: 'js'
- name: Info
run: mvn -version
- name: Test
Expand Down
39 changes: 19 additions & 20 deletions driver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,6 @@
</properties>

<profiles>
<profile>
<id>no-graalvm</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<testExcludes>
<exclude>graalvm/UnicodeUtilsTest.java</exclude>
</testExcludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>static-code-analysis</id>
<build>
Expand Down Expand Up @@ -189,6 +169,25 @@
<version>${graalvm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js-language</artifactId>
<version>${graalvm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.graalvm.polyglot</groupId>
<artifactId>polyglot</artifactId>
<version>${graalvm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.graalvm.polyglot</groupId>
<artifactId>js</artifactId>
<version>${graalvm.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config-core</artifactId>
Expand Down
1 change: 0 additions & 1 deletion driver/src/test/java/helper/NativeImageHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.net.URL;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Stream;

Expand Down
3 changes: 0 additions & 3 deletions driver/src/test/java/unicode/UnicodeUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import com.arangodb.util.TestUtils;
import com.arangodb.util.UnicodeUtils;
import org.graalvm.home.Version;
import org.graalvm.nativeimage.ImageInfo;
import org.graalvm.polyglot.Context;
import org.graalvm.polyglot.Value;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.junit.jupiter.api.Assumptions.assumeTrue;


Expand All @@ -26,7 +24,6 @@ class UnicodeUtilsTest {

@BeforeAll
static void beforeClass() {
assumeFalse(ImageInfo.inImageCode(), "skipped in native mode");
assumeTrue(Version.getCurrent().isRelease(), "This test requires GraalVM");
context = Context.create();
jsEncoder = context.eval("js", encodeFn);
Expand Down
2 changes: 1 addition & 1 deletion shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>22.3.3</version>
<version>${graalvm.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
Loading