diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2112216..98c995a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,17 +30,6 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.IMAGE_NAME }} - - name: Set up Bazel cache - uses: actions/cache@v3 - with: - path: bazel-cache - key: bazel-${{ matrix.platform }}-${{ hashFiles('Dockerfile') }} - restore-keys: bazel-${{ matrix.platform }} - - name: Inject Bazel cache into Docker - uses: reproducible-containers/buildkit-cache-dance@v2.1.3 - with: - cache-source: bazel-cache - cache-target: /root/.cache/bazel - name: Build and push id: build uses: docker/build-push-action@v5 diff --git a/Dockerfile b/Dockerfile index 4312e50..6665127 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,62 +1,11 @@ # syntax=docker/dockerfile:1.4 FROM debian:bookworm AS builder ARG TARGETARCH -ARG LLVM_VERSION=17 - -RUN < /etc/apt/apt.conf.d/keep-cache -EOT - -# Install LLVM -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked < /etc/apt/sources.list.d/llvm.list - curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - apt-get update - apt-get install -y --no-install-recommends \ - llvm-${LLVM_VERSION} \ - lld-${LLVM_VERSION} \ - clang-${LLVM_VERSION} \ - libc++-${LLVM_VERSION}-dev \ - libc++abi-${LLVM_VERSION}-dev \ - libunwind-${LLVM_VERSION}-dev -EOT - -# Install bazelisk -RUN <> .bazelrc -EOT - -RUN --mount=type=cache,target=/root/.cache/bazelisk \ - --mount=type=cache,target=/root/.cache/bazel < "$target_path" +chmod +x "$target_path" diff --git a/workerd.patch b/workerd.patch deleted file mode 100644 index 03fc3f3..0000000 --- a/workerd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/workerd/jsg/setup.c++ b/src/workerd/jsg/setup.c++ -index 7724606..c3eeea2 100644 ---- a/src/workerd/jsg/setup.c++ -+++ b/src/workerd/jsg/setup.c++ -@@ -112,7 +112,7 @@ V8System::V8System(kj::Own platformParam, kj::ArrayPtr