diff --git a/.github/workflows/test-java-bindings-new.yml b/.github/workflows/test-java-bindings-new.yml index 774728af..9b89d110 100644 --- a/.github/workflows/test-java-bindings-new.yml +++ b/.github/workflows/test-java-bindings-new.yml @@ -1,4 +1,4 @@ -name: Cross-platform Build and Test +name: Java Cross-platform Build and Test on: push: branches: [ "master" ] @@ -27,18 +27,22 @@ jobs: os: windows-latest steps: - uses: actions/checkout@v3 + - name: Install Rust uses: actions-rs/toolchain@v1 with: toolchain: stable target: ${{ matrix.target }} override: true + - name: Install cargo-binstall uses: taiki-e/install-action@cargo-binstall + - name: Install Zig uses: goto-bus-stop/setup-zig@v2 with: version: 0.10.1 + - name: Install cargo-zigbuild run: cargo binstall --no-confirm cargo-zigbuild @@ -47,6 +51,7 @@ jobs: chmod +x .github/scripts/compile_all_targets_java_new.sh .github/scripts/compile_all_targets_java_new.sh ${{ matrix.target }} shell: bash + - name: Upload artifacts uses: actions/upload-artifact@v3 with: @@ -54,46 +59,41 @@ jobs: path: bindings/java/java_code test: - name: Test on ${{ matrix.os }} + name: Test on ${{ matrix.target }} needs: build strategy: matrix: include: - - os: ubuntu-latest - target: x86_64-unknown-linux-gnu - - os: linux-arm64 - target: aarch64-unknown-linux-gnu - - os: macos-13 - target: x86_64-apple-darwin - - os: macos-14 - target: aarch64-apple-darwin - - os: windows-latest - target: x86_64-pc-windows-gnu + - target: x86_64-unknown-linux-gnu + os: ubuntu-latest + - target: aarch64-unknown-linux-gnu + os: linux-arm64 + - target: x86_64-apple-darwin + os: macos-13 + - target: aarch64-apple-darwin + os: macos-14 + - target: x86_64-pc-windows-gnu + os: windows-latest + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - override: true - name: Download artifacts uses: actions/download-artifact@v3 with: name: ${{ matrix.target }}-java-code path: bindings/java/java_code - - name: List contents of downloaded artifact - run: ls -R bindings/java/java_code - shell: bash + - name: Set up JDK uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: '17' + - name: Build with Gradle (no tests) run: ./gradlew build -x test working-directory: bindings/java/java_code + - name: Run Gradle tests run: ./gradlew test --info --stacktrace --scan working-directory: bindings/java/java_code \ No newline at end of file