Skip to content

Commit 6e2db0d

Browse files
committed
update
1 parent 0770c40 commit 6e2db0d

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

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

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,8 @@ jobs:
1515
toolchain: stable
1616
override: true
1717
default: true
18-
- name: Add targets
19-
run: |
20-
rustup target add x86_64-unknown-linux-gnu
21-
rustup target add aarch64-unknown-linux-gnu
22-
rustup target add x86_64-apple-darwin
23-
rustup target add aarch64-apple-darwin
24-
rustup target add x86_64-pc-windows-gnu
2518
- name: Setup Docker
26-
run: |
27-
sudo apt-get update
28-
sudo apt-get install \
29-
ca-certificates \
30-
curl \
31-
gnupg \
32-
lsb-release
33-
sudo mkdir -p /etc/apt/keyrings
34-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
35-
echo \
36-
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
37-
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
38-
sudo apt-get update
39-
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
19+
uses: docker-practice/actions-setup-docker@v1
4020
- name: Setup cross
4121
run: cargo install -f cross
4222
- name: Maven test

java-api/native_lib_build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ echo "start cross compilations"
66
cd ..
77

88
echo "compile target=x86_64-unknown-linux-gnu"
9+
rustup target add x86_64-unknown-linux-gnu
910
cross build --release --target=x86_64-unknown-linux-gnu
10-
cp -f target/x86_64-unknown-linux-gnu/release/libprql4j.so java-api/src/main/resources/libprql4j-linux64.so
11+
cp -f target/x86_64-unknown-linux-gnu/release/libprql_java.so java-api/src/main/resources/libprql_java-linux64.so
1112

1213
echo "compile target=aarch64-unknown-linux-gnu"
14+
rustup target add aarch64-unknown-linux-gnu
1315
cross build --release --target=aarch64-unknown-linux-gnu
14-
cp -f target/aarch64-unknown-linux-gnu/release/libprql4j.so java-api/src/main/resources/libprql4j-linux-aarch64.so
16+
cp -f target/aarch64-unknown-linux-gnu/release/libprql_java.so java-api/src/main/resources/libprql_java-linux-aarch64.so
1517

1618
#echo "compile target=x86_64-apple-darwin"
1719
#cross build --release --target=x86_64-apple-darwin

0 commit comments

Comments
 (0)