Skip to content

Commit 5c57a42

Browse files
committed
ensure we aren't including/claiming to build any ARM v7 things
1 parent 393787b commit 5c57a42

File tree

4 files changed

+2
-30
lines changed

4 files changed

+2
-30
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ jobs:
118118
target: aarch64-linux-android
119119
if: ${{ github.ref == 'refs/heads/main' }}
120120
build: yarn build --target aarch64-linux-android
121-
# - host: ubuntu-latest
122-
# target: armv7-linux-androideabi
123-
# if: false
124-
# build: |
125-
# yarn build --target armv7-linux-androideabi
126121
- host: ubuntu-latest
127122
target: aarch64-unknown-linux-musl
128123
if: ${{ github.ref == 'refs/heads/main' }}
@@ -134,6 +129,7 @@ jobs:
134129
export CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc
135130
export CXX_aarch64_unknown_linux_musl=aarch64-linux-musl-g++
136131
export AR_aarch64_unknown_linux_musl=aarch64-linux-musl-ar
132+
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-ld
137133
yarn build --target aarch64-unknown-linux-musl
138134
- host: windows-latest
139135
target: aarch64-pc-windows-msvc

npm/android-arm-eabi/README.md

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

npm/android-arm-eabi/package.json

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

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngrok/ngrok",
3-
"version": "1.5.0",
3+
"version": "1.5.1",
44
"main": "index.js",
55
"types": "index.d.ts",
66
"files": [
@@ -27,7 +27,6 @@
2727
"x86_64-unknown-linux-musl",
2828
"x86_64-unknown-freebsd",
2929
"i686-pc-windows-msvc",
30-
"armv7-linux-androideabi",
3130
"universal-apple-darwin"
3231
]
3332
}

0 commit comments

Comments
 (0)