8000 feat: add two last android targets (#154) · unrs/unrs-resolver@bcd9da6 · GitHub
[go: up one dir, main page]
Skip to content

Commit bcd9da6

Browse files
JounQinJounQin
authored
feat: add two last android targets (#154)
1 parent e3e93eb commit bcd9da6

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

‎.github/actions/pnpm/action.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ inputs:
66
architecture:
77
description: The architecture to use
88
required: false
9+
cpu:
10+
description: The cpu architecture to use
11+
required: false
912

1013
runs:
1114
using: composite
@@ -18,9 +21,11 @@ runs:
1821
architecture: ${{ inputs.architecture }}
1922
cache: pnpm
2023

21-
- if: ${{ inputs.architecture == 'x86' }}
24+
- if: ${{ inputs.cpu }}
2225
shell: bash
23-
run: pnpm config set supportedArchitectures.cpu "ia32"
26+
run: pnpm config set supportedArchitectures.cpu "${CPU_ARCH}"
27+
env:
28+
CPU_ARCH: ${{ inputs.cpu }}
2429

2530
- name: pnpm
2631
shell: bash

‎.github/workflows/release-napi.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,17 @@ jobs:
5656
- os: windows-latest
5757
target: i686-pc-windows-msvc
5858
architecture: x86
59+
cpu: ia32
5960
build: pnpm build
6061
- os: ubuntu-latest
6162
target: x86_64-unknown-linux-gnu
6263
build: pnpm build --use-napi-cross
6364
- os: ubuntu-latest
6465
target: x86_64-unknown-linux-musl
6566
build: pnpm build -x
67+
- os: ubuntu-latest
68+
target: aarch64-linux-android
69+
build: pnpm build
6670
- os: ubuntu-latest
6771
target: aarch64-unknown-linux-gnu
6872
build: pnpm build --use-napi-cross
@@ -72,6 +76,10 @@ jobs:
7276
- os: ubuntu-latest
7377
target: armv7-unknown-linux-gnueabihf
7478
build: pnpm build --use-napi-cross
79+
- os: ubuntu-latest
80+
target: armv7-linux-androideabi
81+
architecture: x86
82+
build: pnpm build
7583
- os: ubuntu-latest
7684
target: armv7-unknown-linux-musleabihf
7785
build: pnpm build -x
@@ -110,6 +118,7 @@ jobs:
110118
- uses: ./.github/actions/pnpm
111119
with:
112120
architecture: ${{ matrix.architecture }}
121+
cpu: ${{ matrix.cpu }}
113122

114123
- run: rustup target add ${{ matrix.target }}
115124

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@
5858
"x86_64-unknown-linux-gnu",
5959
"x86_64-unknown-linux-musl",
6060
"x86_64-unknown-freebsd",
61+
"aarch64-linux-android",
6162
"aarch64-unknown-linux-gnu",
6263
"aarch64-unknown-linux-musl",
64+
"armv7-linux-androideabi",
6365
"armv7-unknown-linux-gnueabihf",
6466
"armv7-unknown-linux-musleabihf",
6567
"powerpc64le-unknown-linux-gnu",

0 commit comments

Comments
 (0)
0