Skip to content

Commit a4b23cf

Browse files
chore(releasing): extend deb-verify and rpm-verify to cover aarch64 (#25487)
* ci(releasing): extend deb-verify and rpm-verify to cover aarch64 * ci(releasing): use POSIX-compatible shell substitution for dd-pkg arch mapping
1 parent c5959d7 commit a4b23cf

1 file changed

Lines changed: 24 additions & 10 deletions

File tree

.github/workflows/publish.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273

274274
deb-verify:
275275
name: Verify DEB Packages
276-
runs-on: ubuntu-24.04
276+
runs-on: ${{ matrix.runner }}
277277
timeout-minutes: 5
278278
needs:
279279
- generate-publish-metadata
@@ -284,6 +284,9 @@ jobs:
284284
DD_PKG_VERSION: "latest"
285285
strategy:
286286
matrix:
287+
runner:
288+
- ubuntu-24.04
289+
- ubuntu-24.04-arm
287290
container:
288291
- ubuntu:20.04
289292
- ubuntu:22.04
@@ -304,25 +307,29 @@ jobs:
304307
make
305308
- name: Install dd-pkg for linting
306309
run: |
307-
curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_x86_64.tar.gz" | tar -xz -C /usr/local/bin dd-pkg
310+
ARCH=$(uname -m)
311+
case "$ARCH" in aarch64) ARCH_DL=arm64 ;; *) ARCH_DL="$ARCH" ;; esac
312+
curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_${ARCH_DL}.tar.gz" | tar -xz -C /usr/local/bin dd-pkg
308313
- name: Fix Git safe directories issue when in containers (actions/checkout#760)
309314
run: git config --global --add safe.directory /__w/vector/vector
310315
- name: Checkout Vector
311316
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
312317
with:
313318
ref: ${{ inputs.git_ref }}
314-
- name: Download staged package artifacts (x86_64-unknown-linux-gnu)
319+
- name: Set artifact name
320+
run: echo "ARTIFACT=$(uname -m)-unknown-linux-gnu" >> "$GITHUB_ENV"
321+
- name: Download staged package artifacts
315322
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
316323
with:
317-
name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
324+
name: vector-${{ env.VECTOR_VERSION }}-${{ env.ARTIFACT }}
318325
path: target/artifacts
319326
- name: Verify install of DEB package.
320327
run: |
321-
./scripts/verify-install.sh target/artifacts/vector_${{ env.VECTOR_VERSION }}-1_amd64.deb
328+
./scripts/verify-install.sh "target/artifacts/vector_${{ env.VECTOR_VERSION }}-1_$(dpkg --print-architecture).deb"
322329
323330
rpm-verify:
324331
name: Verify RPM Packages
325-
runs-on: ubuntu-24.04
332+
runs-on: ${{ matrix.runner }}
326333
timeout-minutes: 10
327334
needs:
328335
- generate-publish-metadata
@@ -333,6 +340,9 @@ jobs:
333340
DD_PKG_VERSION: "latest"
334341
strategy:
335342
matrix:
343+
runner:
344+
- ubuntu-24.04
345+
- ubuntu-24.04-arm
336346
container:
337347
# Lowest supported glibc tier (EL8 family, glibc 2.28). Catches glibc-floor regressions.
338348
- "almalinux:8@sha256:ca871b110064fe81bff0250ed5cc56fbb0a9840715f09811c33bbf9d72cef56c"
@@ -358,21 +368,25 @@ jobs:
358368
fi
359369
- name: Install dd-pkg for linting
360370
run: |
361-
curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_x86_64.tar.gz" | tar -xz -C /usr/local/bin dd-pkg
371+
ARCH=$(uname -m)
372+
case "$ARCH" in aarch64) ARCH_DL=arm64 ;; *) ARCH_DL="$ARCH" ;; esac
373+
curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_${ARCH_DL}.tar.gz" | tar -xz -C /usr/local/bin dd-pkg
362374
- name: Fix Git safe directories issue when in containers (actions/checkout#760)
363375
run: git config --global --add safe.directory /__w/vector/vector
364376
- name: Checkout Vector
365377
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
366378
with:
367379
ref: ${{ inputs.git_ref }}
368-
- name: Download staged package artifacts (x86_64-unknown-linux-gnu)
380+
- name: Set artifact name
381+
run: echo "ARTIFACT=$(uname -m)-unknown-linux-gnu" >> "$GITHUB_ENV"
382+
- name: Download staged package artifacts
369383
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
370384
with:
371-
name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
385+
name: vector-${{ env.VECTOR_VERSION }}-${{ env.ARTIFACT }}
372386
path: target/artifacts
373387
- name: Verify install of RPM package.
374388
run: |
375-
./scripts/verify-install.sh target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm
389+
./scripts/verify-install.sh "target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.$(uname -m).rpm"
376390
377391
macos-verify:
378392
name: Verify macOS Package

0 commit comments

Comments
 (0)