Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
key: ${{ matrix.os }}-iroh4k-${{ hashFiles('iroh4k/src/rust/Cargo.lock') }}
restore-keys: ${{ matrix.os }}-iroh4k-

- uses: gradle/actions/setup-gradle@v6
- uses: gradle/actions/setup-gradle@v6.2.0

# Run the two test tasks in separate invocations. Sharing one invocation has been observed
# to let a Rust rebuild swap the JNI shared library out from under a running test JVM,
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Install cargo-ndk
run: command -v cargo-ndk || cargo install cargo-ndk --locked

- uses: gradle/actions/setup-gradle@v6
- uses: gradle/actions/setup-gradle@v6.2.0

# The runner image exports ANDROID_NDK_HOME, which is where `rustJni` looks first; on a
# machine without it the plugin falls back to ndk.dir/sdk.dir in local.properties.
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
key: ${{ matrix.os }}-${{ matrix.target }}-${{ hashFiles('iroh4k/src/rust/Cargo.lock') }}
restore-keys: ${{ matrix.os }}-${{ matrix.target }}-

- uses: gradle/actions/setup-gradle@v6
- uses: gradle/actions/setup-gradle@v6.2.0

- name: Assemble
run: ./gradlew :iroh4k:assemble -Ptargets=${{ matrix.target }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
shell: bash
run: command -v cargo-ndk || cargo install cargo-ndk --locked

- uses: gradle/actions/setup-gradle@v6
- uses: gradle/actions/setup-gradle@v6.2.0
if: matrix.android

- name: Build Android JNI libraries
Expand Down Expand Up @@ -156,11 +156,11 @@ jobs:
- name: Install Rust
run: rustup show

- uses: gradle/actions/setup-gradle@v6
- uses: gradle/actions/setup-gradle@v6.2.0

# The AAR needs an Android SDK to configure and package, and the publisher cannot move off
# macOS to find one.
- uses: android-actions/setup-android@v3
- uses: android-actions/setup-android@v4

- name: Resolve the version
id: version
Expand All @@ -181,13 +181,13 @@ jobs:
if: steps.version.outputs.release == 'true'
run: scripts/check-release-version.sh "${{ steps.version.outputs.version }}"

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
pattern: rust-*
merge-multiple: true
path: rust-artifacts

- uses: actions/download-artifact@v7
- uses: actions/download-artifact@v8
with:
name: android-jnilibs
path: iroh4k/src/androidMain/jniLibs
Expand Down