Skip to content

Commit f3125e5

Browse files
committed
Provide builds for armeabi-v7a, x86, x86_64.
1 parent 2eb4df3 commit f3125e5

File tree

2 files changed

+14
-27
lines changed

2 files changed

+14
-27
lines changed

.github/workflows/build.yaml

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -70,32 +70,16 @@ jobs:
7070
fail-fast: false
7171
matrix:
7272
include:
73-
- runs-on: ubuntu-24.04
74-
os: linux
75-
arch: x86_64
76-
target: x86_64-unknown-linux-musl
77-
- runs-on: ubuntu-24.04-arm
78-
os: linux
79-
arch: arm64
80-
target: aarch64-unknown-linux-musl
81-
- runs-on: ubuntu-24.04
82-
os: linux
83-
arch: riscv64
84-
target: riscv64gc-unknown-linux-gnu
85-
glibc-version: 2.27
86-
- runs-on: ubuntu-24.04
87-
os: linux
88-
arch: loongarch64
89-
target: loongarch64-unknown-linux-gnu
90-
- runs-on: ubuntu-24.04
91-
os: freebsd
92-
arch: x86_64
93-
target: x86_64-unknown-freebsd
94-
- runs-on: ubuntu-24.04
95-
os: android
96-
arch: arm64v8a
97-
target: aarch64-linux-android
98-
runs-on: ${{ matrix.runs-on }}
73+
- { os: linux, arch: x86_64, target: x86_64-unknown-linux-musl }
74+
- { os: linux, arch: arm64, target: aarch64-unknown-linux-musl, runs-on: ubuntu-24.04-arm }
75+
- { os: linux, arch: riscv64, target: riscv64gc-unknown-linux-gnu, glibc-version: 2.27 }
76+
- { os: linux, arch: loongarch64, target: loongarch64-unknown-linux-gnu }
77+
- { os: freebsd, arch: x86_64, target: x86_64-unknown-freebsd }
78+
- { os: android, arch: armv7 , target: armv7-linux-androideabi }
79+
- { os: android, arch: arm64v8a, target: aarch64-linux-android }
80+
- { os: android, arch: x86, target: i686-linux-android }
81+
- { os: android, arch: x86_64, target: x86_64-linux-android }
82+
runs-on: ${{ matrix.runs-on || 'ubuntu-24.04' }}
9983
name: Build (${{ matrix.target }})
10084
steps:
10185
- name: Checkout
@@ -287,7 +271,10 @@ jobs:
287271
"terracotta-${TERRACOTTA_VERSION}-freebsd-x86_64"
288272
"terracotta-${TERRACOTTA_VERSION}-macos-x86_64"
289273
"terracotta-${TERRACOTTA_VERSION}-macos-arm64"
274+
"terracotta-${TERRACOTTA_VERSION}-android-armv7.so"
290275
"terracotta-${TERRACOTTA_VERSION}-android-arm64v8a.so"
276+
"terracotta-${TERRACOTTA_VERSION}-android-x86.so"
277+
"terracotta-${TERRACOTTA_VERSION}-android-x86_64.so"
291278
)
292279
293280
file=$(mktemp -t XXXXXX.zip)

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ fn download_easytier() {
181181
cli: "easytier-cli",
182182
desc: "freebsd-x86_64",
183183
},
184-
("android", "aarch64") => return,
184+
("android", "arm") | ("android", "aarch64") | ("android", "x86") | ("android", "x86_64") => return,
185185
_ => panic!(
186186
"Cannot compile Terracotta on {}-{}: Cannot find valid EasyTier binary.",
187187
target_os, target_arch

0 commit comments

Comments
 (0)