diff options
| -rw-r--r-- | .github/workflows/bun-linux-build.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.github/workflows/bun-linux-build.yml b/.github/workflows/bun-linux-build.yml index d63580e55..41239ce45 100644 --- a/.github/workflows/bun-linux-build.yml +++ b/.github/workflows/bun-linux-build.yml @@ -38,18 +38,21 @@ jobs: build_arch: amd64 runner: linux-amd64 webkit_url: "https://github.com/oven-sh/WebKit/releases/download/jul27-2/bun-webkit-linux-amd64-baseline.tar.gz" + webkit_basename: "bun-webkit-linux-amd64-baseline" - cpu: westmere tag: linux-x64-baseline arch: x86_64 build_arch: amd64 runner: linux-amd64 webkit_url: "https://github.com/oven-sh/WebKit/releases/download/jul27-2/bun-webkit-linux-amd64-baseline.tar.gz" + webkit_basename: "bun-webkit-linux-amd64-baseline" - cpu: native tag: linux-aarch64 arch: aarch64 build_arch: arm64 runner: linux-arm64 webkit_url: "https://github.com/oven-sh/WebKit/releases/download/jul27-2/bun-webkit-linux-arm64.tar.gz" + webkit_basename: "bun-webkit-linux-arm64" steps: - uses: actions/checkout@v3 @@ -82,6 +85,7 @@ jobs: CPU_TARGET=${{matrix.cpu}} WEBKIT_URL=${{matrix.webkit_url}} GIT_SHA=${{github.sha}} + WEBKIT_BASENMAE=${{matrix.webkit_basename}} platforms: linux/${{matrix.build_arch}} target: artifact outputs: type=local,dest=${{runner.temp}}/release diff --git a/Dockerfile b/Dockerfile index 2356acb53..f839a9563 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,9 @@ ARG TRIPLET=${ARCH}-linux-gnu ARG BUILDARCH=amd64 ARG WEBKIT_TAG=jul27-2 ARG ZIG_TAG=jul1 -ARG WEBKIT_URL="https://github.com/oven-sh/WebKit/releases/download/$WEBKIT_TAG/bun-webkit-linux-$BUILDARCH.tar.gz" +ARG WEBKIT_BASENAME="bun-webkit-linux-$BUILDARCH.tar.gz" +ARG WEBKIT_URL="https://github.com/oven-sh/WebKit/releases/download/$WEBKIT_TAG/${WEBKIT_BASENAME}" + ARG ZIG_URL="https://github.com/oven-sh/zig/releases/download/$ZIG_TAG/zig-linux-$BUILDARCH.zip" ARG GIT_SHA="" @@ -90,11 +92,12 @@ ARG BUILDARCH ARG ZIG_PATH ARG WEBKIT_URL ARG ZIG_URL +ARG WEBKIT_BASENAME ADD ${WEBKIT_URL} . RUN mkdir -p ${WEBKIT_DIR} && cd ${GITHUB_WORKSPACE} && \ - gunzip bun-webkit-linux-$BUILDARCH.tar.gz && tar -xf bun-webkit-linux-$BUILDARCH.tar && \ + gunzip ${WEBKIT_BASENAME}.tar.gz && tar -xf ${WEBKIT_BASENAME}.tar && \ cat ${WEBKIT_DIR}/include/cmakeconfig.h > /dev/null LABEL org.opencontainers.image.title="bun base image with zig & webkit ${BUILDARCH} (glibc)" |