From b416a24287079b7c937392043bf3b6eb8d1e45f9 Mon Sep 17 00:00:00 2001 From: Tarek Date: Thu, 19 Dec 2024 21:46:22 +0200 Subject: [PATCH] feat(CI): consolidate Java bindings workflow into build.yml Signed-off-by: Tarek --- .github/workflows/build.yml | 38 ++++++++++++++++++++++++ .github/workflows/java-bindings.yml | 46 ----------------------------- 2 files changed, 38 insertions(+), 46 deletions(-) delete mode 100644 .github/workflows/java-bindings.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03bae72..e136412 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,3 +59,41 @@ jobs: with: name: release-build-${{ matrix.os }} path: target/release/ + + java-bindings: + name: Java Bindings + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-14] + needs: build-and-test + + steps: + - uses: actions/checkout@v4 + - name: Download Build Artifacts + uses: actions/download-artifact@v3 + with: + name: release-build-${{ matrix.os }} + path: ./release + + - name: Install JDK + uses: actions/setup-java@v4.2.1 + with: + distribution: "temurin" + java-version: "22" + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 + + - name: Set up Android SDK + uses: android-actions/setup-android@v3 + + - name: Set up Android NDK + uses: nttld/setup-ndk@v1 + with: + link-to-sdk: true + ndk-version: r28-beta2 + + - name: Run Java Tests + run: gradle test + working-directory: ./java diff --git a/.github/workflows/java-bindings.yml b/.github/workflows/java-bindings.yml deleted file mode 100644 index 2a5438d..0000000 --- a/.github/workflows/java-bindings.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Java Bindings - -on: - workflow_run: - workflows: - - Verify Build - types: - - completed - -jobs: - java-bindings: - name: Java Bindings - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-14] - - steps: - - uses: actions/checkout@v4 - - name: Download Build Artifacts - uses: actions/download-artifact@v3 - with: - name: release-build-${{ matrix.os }} - path: ./release - - - name: Install JDK - uses: actions/setup-java@v4.2.1 - with: - distribution: "temurin" - java-version: "22" - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 - - - name: Set up Android SDK - uses: android-actions/setup-android@v3 - - - name: Set up Android NDK - uses: nttld/setup-ndk@v1 - with: - link-to-sdk: true - ndk-version: r28-beta2 - - - name: Run Java Tests - run: gradle test - working-directory: ./java