Skip to content

Commit

Permalink
Wip
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuel-keller committed Jun 19, 2024
1 parent e9b979e commit 0316553
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ jobs:
run: cross build --target ${{ matrix.target }} --release

- name: Upload so lib
if: matrix.target == 'x86_64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu'
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target }}-build
path: target/${{ matrix.target }}/release/*.so

- name: Upload dll lib
if: matrix.target == 'x86_64-pc-windows-gnu'
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target }}-build
Expand Down Expand Up @@ -166,7 +168,7 @@ jobs:
path: build/libs/surrealdb-jni-0.2-SNAPSHOT.jar

- name: Linux Integration Test
run: ./gradlew integrationTest
run: ./gradlew -i integrationTest

integration-tests:
runs-on: windows-latest
Expand All @@ -192,7 +194,7 @@ jobs:
path: build/libs

- name: Windows Integration Test
run: ./gradlew integrationTest
run: ./gradlew -i integrationTest

mac-intel-integration-test:
runs-on: macos-12
Expand All @@ -218,7 +220,7 @@ jobs:
path: build/libs

- name: Mac Integration Test
run: ./gradlew integrationTest
run: ./gradlew -i integrationTest

mac-arm-integration-test:
runs-on: macos-latest
Expand All @@ -244,4 +246,4 @@ jobs:
path: build/libs

- name: Mac Integration Test
run: ./gradlew integrationTest
run: ./gradlew -i integrationTest
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,11 @@ tasks.register('integrationTest', Test) {
useJUnitPlatform()
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug'
testLogging {
showStandardStreams = true
events "passed", "skipped", "failed", "standardOut", "standardError"
exceptionFormat = 'full'
showCauses = true
showStackTraces = true
}
}
4 changes: 1 addition & 3 deletions src/main/java/com/surrealdb/Surreal.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.surrealdb;

import static com.surrealdb.Loader.load_native;

public class Surreal implements AutoCloseable {

static {
load_native();
Loader.load_native();
}

final int id;
Expand Down

0 comments on commit 0316553

Please sign in to comment.