From f43033438aa30fcf48c03198c753d1883b92b9ae Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Thu, 27 Jun 2024 11:45:19 -0700 Subject: [PATCH] Use machine hardware name instead of TARGETARCH in tarball name The tarball contains a subdirectory named by the machine hardware name, so the tarball name should match this. Signed-off-by: Jan Dubois --- .github/workflows/package.Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package.Dockerfile b/.github/workflows/package.Dockerfile index 14249c2c6..376db2e3f 100644 --- a/.github/workflows/package.Dockerfile +++ b/.github/workflows/package.Dockerfile @@ -22,18 +22,17 @@ RUN abuild -r WORKDIR /alpine/openresty RUN abuild -r -ARG TARGETARCH ARG RELEASE_VERSION WORKDIR /home/abuild-user/packages/alpine/ RUN cp ~/.abuild/rd-openresty-*.pub . -RUN tar cvf /tmp/openresty-${TARGETARCH}.tar \ +RUN tar cvf /tmp/openresty-$(uname -m).tar \ *.pub \ $(uname -m)/rd-openresty-[0-9]*.apk \ $(uname -m)/rd-openresty-openssl111-[0-9]*.apk \ $(uname -m)/rd-openresty-pcre-[0-9]*.apk \ $(uname -m)/rd-openresty-zlib-[0-9]*.apk RUN if [ -n "${RELEASE_VERSION}" ]; \ - then mv /tmp/openresty-${TARGETARCH}.tar /tmp/openresty-${RELEASE_VERSION}-${TARGETARCH}.tar; \ + then mv /tmp/openresty-$(uname -m).tar /tmp/openresty-${RELEASE_VERSION}-$(uname -m).tar; \ fi FROM scratch