Skip to content

Commit 1c049d0

Browse files
authored
Merge pull request #922 from Myshkouski/build/armv7
Add armv7-unknown-linux-gnueabihf target
2 parents c47e15c + e421594 commit 1c049d0

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

.github/workflows/release.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
projectPath: crates/openfang-desktop
135135
args: ${{ matrix.platform.args }}
136136

137-
# ── CLI Binary (5 platforms) ──────────────────────────────────────────────
137+
# ── CLI Binary (7 platforms) ──────────────────────────────────────────────
138138
cli:
139139
name: CLI / ${{ matrix.target }}
140140
runs-on: ${{ matrix.os }}
@@ -148,6 +148,9 @@ jobs:
148148
- target: aarch64-unknown-linux-gnu
149149
os: ubuntu-22.04
150150
archive: tar.gz
151+
- target: armv7-unknown-linux-gnueabihf
152+
os: ubuntu-22.04
153+
archive: tar.gz
151154
- target: x86_64-apple-darwin
152155
os: macos-latest
153156
archive: tar.gz
@@ -169,17 +172,17 @@ jobs:
169172
- name: Install build deps (Linux)
170173
if: runner.os == 'Linux'
171174
run: sudo apt-get update && sudo apt-get install -y pkg-config libssl-dev
172-
- name: Install cross (Linux aarch64)
173-
if: matrix.target == 'aarch64-unknown-linux-gnu'
175+
- name: Install cross (Linux aarch64/armv7)
176+
if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'armv7-unknown-linux-gnueabihf'
174177
run: cargo install cross --locked
175178
- uses: Swatinem/rust-cache@v2
176179
with:
177180
key: cli-${{ matrix.target }}
178181
- name: Build CLI (cross)
179-
if: matrix.target == 'aarch64-unknown-linux-gnu'
182+
if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'armv7-unknown-linux-gnueabihf'
180183
run: cross build --release --target ${{ matrix.target }} --bin openfang
181184
- name: Build CLI
182-
if: matrix.target != 'aarch64-unknown-linux-gnu'
185+
if: matrix.target != 'aarch64-unknown-linux-gnu' && matrix.target != 'armv7-unknown-linux-gnueabihf'
183186
run: cargo build --release --target ${{ matrix.target }} --bin openfang
184187
- name: Ad-hoc codesign CLI binary (macOS)
185188
if: runner.os == 'macOS'

Cross.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ pre-build = [
33
"dpkg --add-architecture $CROSS_DEB_ARCH",
44
"apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH"
55
]
6+
7+
[target.armv7-unknown-linux-gnueabihf]
8+
pre-build = [
9+
"dpkg --add-architecture $CROSS_DEB_ARCH",
10+
"apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH"
11+
]

0 commit comments

Comments
 (0)