Skip to content

Commit 21c31a8

Browse files
committed
ci(release): build linux/arm64 binary + arch-suffixed apk
The .deb (arm64), .rpm (aarch64), and .apk (aarch64) jobs all expected a `noir-v${VERSION}-linux-arm64` asset that was never produced — the binaries workflow only ran on `ubuntu-latest` (x86_64) and `macos-latest`. - Add `ubuntu-24.04-arm` to release-binaries matrix and broaden the Linux-build conditional to all Ubuntu runners. - Rename apk artifact to `noir-${VERSION}-${arch}.apk` so the x86_64 and aarch64 jobs don't clobber each other on the GitHub Release. - Update install docs (en/ko) to use the arch-suffixed apk filename.
1 parent 6793da0 commit 21c31a8

4 files changed

Lines changed: 12 additions & 7 deletions

File tree

.github/workflows/release-apk.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,12 @@ jobs:
110110
- name: Copy artifacts
111111
run: |
112112
mkdir -p output
113-
find /home/builder/packages -name "*.apk" ! -name "APKINDEX*" -exec cp {} output/ \;
113+
# abuild emits noir-${VERSION}-r${pkgrel}.apk without arch in the
114+
# filename, so rename it to include the arch and avoid x86_64 /
115+
# aarch64 jobs overwriting each other on the GitHub Release.
116+
for src in $(find /home/builder/packages -name "*.apk" ! -name "APKINDEX*"); do
117+
cp "$src" "output/noir-${{ env.VERSION }}-${{ matrix.arch }}.apk"
118+
done
114119
ls -la output/
115120
116121
- name: Upload artifacts

.github/workflows/release-binaries.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: [ubuntu-latest, macos-latest]
15+
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
1616
runs-on: ${{ matrix.os }}
1717
steps:
1818
- name: Install Crystal
@@ -32,7 +32,7 @@ jobs:
3232
else
3333
echo "ARCH=unknown" >> $GITHUB_ENV
3434
fi
35-
- if: matrix.os == 'ubuntu-latest'
35+
- if: startsWith(matrix.os, 'ubuntu')
3636
name: Build binary (Linux)
3737
run: |
3838
mkdir -p build

docs/content/get_started/installation/index.ko.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ Alpine Linux 사용자는 [GitHub Releases](https://github.com/owasp-noir/noir/r
165165

166166
```bash
167167
VERSION=$(curl -s https://api.github.com/repos/owasp-noir/noir/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
168-
wget "https://github.com/owasp-noir/noir/releases/download/v${VERSION}/noir-${VERSION}-r0.apk"
168+
wget "https://github.com/owasp-noir/noir/releases/download/v${VERSION}/noir-${VERSION}-x86_64.apk"
169169
```
170170

171171
2. 설치합니다.
172172

173173
```bash
174-
sudo apk add --allow-untrusted "noir-${VERSION}-r0.apk"
174+
sudo apk add --allow-untrusted "noir-${VERSION}-x86_64.apk"
175175
```
176176

177177
3. 설치를 확인합니다.

docs/content/get_started/installation/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ Alpine Linux users can use the `.apk` package from [GitHub Releases](https://git
165165

166166
```bash
167167
VERSION=$(curl -s https://api.github.com/repos/owasp-noir/noir/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
168-
wget "https://github.com/owasp-noir/noir/releases/download/v${VERSION}/noir-${VERSION}-r0.apk"
168+
wget "https://github.com/owasp-noir/noir/releases/download/v${VERSION}/noir-${VERSION}-x86_64.apk"
169169
```
170170

171171
2. Install:
172172

173173
```bash
174-
sudo apk add --allow-untrusted "noir-${VERSION}-r0.apk"
174+
sudo apk add --allow-untrusted "noir-${VERSION}-x86_64.apk"
175175
```
176176

177177
3. Verify:

0 commit comments

Comments
 (0)