diff options
| -rw-r--r-- | .github/workflows/bun-dependenies-build.yml | 7 | ||||
| -rw-r--r-- | Dockerfile | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/.github/workflows/bun-dependenies-build.yml b/.github/workflows/bun-dependenies-build.yml index ba0081f0d..787d49136 100644 --- a/.github/workflows/bun-dependenies-build.yml +++ b/.github/workflows/bun-dependenies-build.yml @@ -39,7 +39,7 @@ jobs: webkit_url: "https://github.com/oven-sh/WebKit/releases/download/dec30/bun-webkit-linux-amd64-lto.tar.gz" webkit_basename: "bun-webkit-linux-amd64-lto" build_machine_arch: x86_64 - - cpu: westmere + - cpu: nehalem tag: linux-x64-baseline arch: x86_64 build_arch: amd64 @@ -104,6 +104,11 @@ jobs: node-version: "16.x" registry-url: "https://registry.npmjs.org" - name: Publish to npm + if: github.ref != 'refs/heads/main' + run: | + cd ${{runner.temp}}/dependencies + npm publish --tag canary --access=public + - name: Publish to npm if: github.ref == 'refs/heads/main' run: | cd ${{runner.temp}}/dependencies diff --git a/Dockerfile b/Dockerfile index 638412d57..8be0376f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ ARG WEBKIT_URL="https://github.com/oven-sh/WebKit/releases/download/$WEBKIT_TAG/ ARG ZIG_URL="https://ziglang.org/builds/${ZIG_FILENAME}" ARG GIT_SHA="" ARG BUN_BASE_VERSION=0.5 +ARG CPU_COUNT=10 FROM bitnami/minideb:bullseye as bun-base @@ -441,6 +442,8 @@ ARG GIT_SHA ARG TRIPLET ARG BUN_DIR ARG CPU_TARGET +ARG CPU_COUNT + ENV CPU_TARGET=${CPU_TARGET} COPY --from=compile_release_obj /tmp/bun-${TRIPLET}-${GIT_SHA}/*.o / @@ -457,6 +460,7 @@ ARG BUN_DEPS_OUT_DIR ARG BUN_DIR ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} +ARG CPU_COUNT COPY Makefile ${BUN_DIR}/Makefile @@ -471,7 +475,7 @@ COPY src/deps/boringssl/include ${BUN_DIR}/src/deps/boringssl/include ENV CCACHE_DIR=/ccache RUN --mount=type=cache,target=/ccache cd $BUN_DIR && mkdir -p src/bun.js/bindings-obj && rm -rf $HOME/.cache zig-cache && mkdir -p $BUN_RELEASE_DIR && make webcrypto && \ - make release-bindings -j10 && mv ${BUN_DEPS_OUT_DIR}/libwebcrypto.a /tmp && mv src/bun.js/bindings-obj/* /tmp + make release-bindings -j$CPU_COUNT && mv ${BUN_DEPS_OUT_DIR}/libwebcrypto.a /tmp && mv src/bun.js/bindings-obj/* /tmp FROM bun-base as sqlite @@ -499,7 +503,7 @@ RUN --mount=type=cache,target=/ccache cd $BUN_DIR && make sqlite FROM scratch as build_release_cpp COPY --from=compile_cpp /tmp/*.o / -COPY --from=compile_cpp /tmp/libwebcrypto.a / +COPY --from=compile_cpp /tmp/*.a / FROM prepare_release as build_release @@ -609,4 +613,4 @@ COPY --from=sqlite ${BUN_DEPS_OUT_DIR}/*.o / COPY --from=tinycc ${BUN_DEPS_OUT_DIR}/*.a / COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.a / COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.o / -COPY --from=c-ares ${BUN_DEPS_OUT_DIR}/*.a /
\ No newline at end of file +COPY --from=c-ares ${BUN_DEPS_OUT_DIR}/*.a / |