diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index eb78ee7..758683b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -18,5 +18,5 @@ jobs: - name: Run Criterion uses: boa-dev/criterion-compare-action@v3 with: - branchName: ${{ github.base_ref }} + branchName: ${{ github.event.workflow_run.head_branch }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e136412..e4b6e24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,9 +29,12 @@ jobs: build-and-test: name: Build and Test runs-on: ${{ matrix.os }} + # Needed for the benchmark workflow to know the base ref + outputs: + base_ref: ${{ github.event.pull_request.base.ref }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-14] + os: [ubuntu-latest] steps: - uses: actions/checkout@v4 @@ -47,53 +50,3 @@ jobs: - name: Build Release run: cargo build --verbose --release - - # `ark-cli-watch.sh` script tests the functionality of `ark-cli watch`, - # which monitors a directory for file changes using a filesystem watcher and updates the index file. - # We need to run it on each platform to ensure it works across all OSes. - - name: Run `ark-cli watch` test - run: ./integration/ark-cli-watch.sh - - - name: Upload Release Build - uses: actions/upload-artifact@v3 - 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