update

Author: doki23

.cargo/config.toml.backup

@@ -1,10 +1,12 @@
 name: prql-java-test
+
 on:
   push:
   pull_request:
     types: [ opened, reopened, synchronize, labeled ]
+
 jobs:
-  ubuntu-test:
+  junit-test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -15,17 +17,11 @@ jobs:
           toolchain: stable
           override: true
           default: true
-#      - name: Add targets
-#        run: |
-#          rustup target add x86_64-unknown-linux-gnu
-#          rustup target add aarch64-unknown-linux-gnu
-      - name: Setup Docker
-        uses: docker-practice/actions-setup-docker@v1
-      - name: Setup cross
-        run: cargo install -f cross
+      - name: build for x86_64-unknown-linux-gnu
+        run: |
+          rustup target add x86_64-unknown-linux-gnu
+          cd ./prql-java/
+          cargo build --release --target=x86_64-unknown-linux-gnu
+          cp -f target/x86_64-unknown-linux-gnu/release/libprql_java.so prql-java/java/src/main/resources/libprql_java-linux64.so
       - name: Maven test
-        run: cd ./java-api && ./mvnw test
-#  macos-test:
-#    runs-on: macos-latest
-#  windows-test:
-#    runs-on: windows-latest
+        run: cd ./prql-java/java/ && ./mvnw test

.github/workflows/prql-java-test.yaml

@@ -6,12 +6,10 @@ echo "start cross compilations"
 cd ..
 
 echo "compile target=x86_64-unknown-linux-gnu"
-rustup target add x86_64-unknown-linux-gnu
 cross build --release --target=x86_64-unknown-linux-gnu
 cp -f target/x86_64-unknown-linux-gnu/release/libprql4j.so java-api/src/main/resources/libprql4j-linux64.so
 
 echo "compile target=aarch64-unknown-linux-gnu"
-rustup target add aarch64-unknown-linux-gnu
 cross build --release --target=aarch64-unknown-linux-gnu
 cp -f target/aarch64-unknown-linux-gnu/release/libprql4j.so java-api/src/main/resources/libprql4j-linux-aarch64.so
 

java-api/native_lib_build.sh

@@ -38,26 +38,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
-                <groupId>org.codehaus.mojo</groupId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Run Script</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>native_lib_build.sh</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>