Skip to content

Commit e234f37

Browse files
committed
use build script
1 parent 430ba7a commit e234f37

File tree

3 files changed

+48
-7
lines changed

3 files changed

+48
-7
lines changed

.github/scripts/compile_all_targets_java.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
99
OUT_DIR="$PROJECT_ROOT/bindings/java/java_code/src/main/resources"
1010
LIB_TYPE="dynamic"
1111
LIB_NAME="java_eth_kzg"
12-
$PROJECT_ROOT/scripts/compile_to_native.sh Darwin arm64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
13-
$PROJECT_ROOT/scripts/compile_to_native.sh Darwin x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
14-
$PROJECT_ROOT/scripts/compile_to_native.sh Windows x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
15-
$PROJECT_ROOT/scripts/compile_to_native.sh Linux x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
16-
$PROJECT_ROOT/scripts/compile_to_native.sh Linux arm64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
12+
$PROJECT_ROOT/scripts/compile_to_native.sh Darwin arm64 $LIB_NAME $LIB_TYPE $OUT_DIR
13+
$PROJECT_ROOT/scripts/compile_to_native.sh Darwin x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR
14+
$PROJECT_ROOT/scripts/compile_to_native.sh Windows x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR
15+
$PROJECT_ROOT/scripts/compile_to_native.sh Linux x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR
16+
$PROJECT_ROOT/scripts/compile_to_native.sh Linux arm64 $LIB_NAME $LIB_TYPE $OUT_DIR
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#!/bin/bash
2+
3+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
4+
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
5+
OUT_DIR="$PROJECT_ROOT/bindings/java/java_code/src/main/resources"
6+
LIB_TYPE="dynamic"
7+
LIB_NAME="java_eth_kzg"
8+
9+
# Check if a target is provided
10+
if [ $# -eq 0 ]; then
11+
echo "Please provide a target architecture."
12+
echo "Supported targets: x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-gnu"
13+
exit 1
14+
fi
15+
16+
TARGET=$1
17+
18+
case $TARGET in
19+
"x86_64-unknown-linux-gnu")
20+
$PROJECT_ROOT/scripts/compile_to_native.sh Linux x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
21+
;;
22+
"aarch64-unknown-linux-gnu")
23+
$PROJECT_ROOT/scripts/compile_to_native.sh Linux arm64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
24+
;;
25+
"aarch64-apple-darwin")
26+
$PROJECT_ROOT/scripts/compile_to_native.sh Darwin arm64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
27+
;;
28+
"x86_64-apple-darwin")
29+
$PROJECT_ROOT/scripts/compile_to_native.sh Darwin x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
30+
;;
31+
"x86_64-pc-windows-gnu")
32+
$PROJECT_ROOT/scripts/compile_to_native.sh Windows x86_64 $LIB_NAME $LIB_TYPE $OUT_DIR zigbuild
33+
;;
34+
*)
35+
echo "Unsupported target: $TARGET"
36+
echo "Supported targets: x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-gnu"
37+
exit 1
38+
;;
39+
esac

.github/workflows/test-java-bindings-new.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ jobs:
5151
if: ${{ matrix.target == 'x86_64-pc-windows-gnu' }}
5252
run: sudo apt-get install gcc-mingw-w64-x86-64 -y
5353

54-
- name: Build with cargo-zigbuild
55-
run: cargo zigbuild --target ${{ matrix.target }} --release
54+
- name: Run compile script
55+
run: |
56+
chmod +x .github/scripts/compile_all_targets_java_new.sh
57+
.github/scripts/compile_all_targets_java_new.sh ${{ matrix.target }}
5658
5759
- name: Upload artifacts
5860
uses: actions/upload-artifact@v3

0 commit comments

Comments
 (0)