Skip to content

Commit 77f6909

Browse files
committed
feat: Use mozilla/actions
1 parent 1412f3a commit 77f6909

14 files changed

Lines changed: 47 additions & 573 deletions

File tree

.github/actionlint-matcher.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/actions/check-android/action.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ inputs:
1717
# https://searchfox.org/mozilla-central/search?q=\bapi_level=&path=taskcluster/scripts/misc/build-llvm-common.sh&regexp=true
1818
# However, NSS requires an API >= 23 for a few symbols.
1919
default: '23'
20-
minimum-nss-version:
21-
description: 'If NSS is required, the minimum version required.'
22-
default: ''
2320
github-token:
2421
description: 'A Github PAT'
2522
required: true
@@ -43,18 +40,18 @@ runs:
4340
WD: ${{ inputs.working-directory }}
4441
run: cd "$WD" && sdkmanager --install "ndk;$NDK_VERSION"
4542

46-
- uses: ./.github/actions/rust
43+
- uses: mozilla/actions/rust@b6b1031d2072eb8c2b181887cb5e194ebcc5caab # v1.0.4
4744
with:
4845
version: stable
4946
targets: ${{ inputs.target }}
5047
tools: cargo-ndk@^4
5148
token: ${{ inputs.github-token }}
5249

53-
- uses: ./.github/actions/nss
54-
if: ${{ inputs.minimum-nss-version != '' }}
50+
- uses: mozilla/actions/nss@b6b1031d2072eb8c2b181887cb5e194ebcc5caab # v1.0.4
5551
with:
56-
minimum-version: ${{ inputs.minimum-nss-version }}
52+
version-file: min_version.txt
5753
target: ${{ inputs.target }}
54+
token: ${{ inputs.github-token }}
5855

5956
- shell: bash
6057
env:
@@ -71,7 +68,7 @@ runs:
7168
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
7269
sudo udevadm control --reload-rules
7370
sudo udevadm trigger --name-match=kvm
74-
cat <<'EOF' > /tmp/rust-android-run-tests-on-emulator.sh
71+
cat <<'SCRIPT' > /tmp/rust-android-run-tests-on-emulator.sh
7572
#!/bin/bash
7673
set -ex
7774
adb wait-for-device
@@ -88,7 +85,7 @@ runs:
8885
grep _FAIL_ output > /dev/null && any_failures=1
8986
done
9087
exit $any_failures
91-
EOF
88+
SCRIPT
9289
chmod a+x /tmp/rust-android-run-tests-on-emulator.sh
9390
9491
- uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # v2.35.0

.github/actions/nss/action.yml

Lines changed: 0 additions & 251 deletions
This file was deleted.

0 commit comments

Comments
 (0)