Skip to content

Commit 80fc3e8

Browse files
authored
Merge branch 'uutils:main' into issue289
2 parents 1ee97f4 + 7b204c0 commit 80fc3e8

9 files changed

Lines changed: 138 additions & 183 deletions

File tree

.github/workflows/GnuComment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
github.event.workflow_run.event == 'pull_request'
1919
steps:
2020
- name: 'Download artifact'
21-
uses: actions/github-script@v8
21+
uses: actions/github-script@v9
2222
with:
2323
script: |
2424
// List all artifacts from GnuTests
@@ -49,7 +49,7 @@ jobs:
4949
- run: unzip comment.zip || echo "Failed to unzip comment artifact"
5050

5151
- name: 'Comment on PR'
52-
uses: actions/github-script@v8
52+
uses: actions/github-script@v9
5353
with:
5454
github-token: ${{ secrets.GITHUB_TOKEN }}
5555
script: |

.github/workflows/GnuTests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,12 @@ jobs:
5858
cargo build --config=profile.release.strip=true --profile=release #-fast
5959
zstd -19 target/release/sed -o ../sed-x86_64-unknown-linux-gnu.zst
6060
- name: Publish latest commit
61-
uses: softprops/action-gh-release@v2
61+
uses: softprops/action-gh-release@v3
6262
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
6363
with:
6464
tag_name: latest-commit
65+
body: |
66+
commit: ${{ github.sha }}
6567
draft: false
6668
prerelease: true
6769
files: |
@@ -132,7 +134,7 @@ jobs:
132134
persist-credentials: false
133135

134136
- name: Retrieve reference artifacts
135-
uses: dawidd6/action-download-artifact@v19
137+
uses: dawidd6/action-download-artifact@v20
136138
continue-on-error: true
137139
with:
138140
workflow: GnuTests.yml

.github/workflows/ci.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,27 @@ jobs:
1717
- uses: dtolnay/rust-toolchain@stable
1818
- run: cargo check
1919

20+
check_android:
21+
name: cargo check (Android ${{ matrix.target }})
22+
runs-on: ubuntu-latest
23+
strategy:
24+
matrix:
25+
target: [aarch64-linux-android, armv7-linux-androideabi]
26+
steps:
27+
- uses: actions/checkout@v6
28+
- uses: dtolnay/rust-toolchain@stable
29+
with:
30+
targets: ${{ matrix.target }}
31+
- uses: android-actions/setup-android@v4
32+
- name: Install Android NDK
33+
run: sdkmanager "ndk;29.0.14206865"
34+
- name: Install cargo-ndk
35+
run: cargo install cargo-ndk
36+
- name: Check Android target
37+
run: cargo ndk --platform 21 --target ${{ matrix.target }} check
38+
env:
39+
ANDROID_NDK_HOME: ${{ env.ANDROID_SDK_ROOT }}/ndk/29.0.14206865
40+
2041
test:
2142
name: cargo test
2243
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)