diff options
| author |  Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-11-24 02:03:09 -0800 |
|---|---|---|
| committer | Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-11-24 02:03:09 -0800 |
| commit | 2aa304a29d38cedac0f2bf1a6a0e6980d4e17f2e (patch) | |
| tree | 21be0d1fd4e6392283d3aa77278d7618bfe7e198 | |
| parent | 3419d3bc02df9d71f81a54b2a4b67fc86a4d00bd (diff) | |
| download | bun-2aa304a29d38cedac0f2bf1a6a0e6980d4e17f2e.tar.gz bun-2aa304a29d38cedac0f2bf1a6a0e6980d4e17f2e.tar.zst bun-2aa304a29d38cedac0f2bf1a6a0e6980d4e17f2e.zip | |
bump
| -rw-r--r-- | .github/workflows/bun-mac-x64.yml | 6 | ||||
| -rw-r--r-- | Dockerfile | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/bun-mac-x64.yml b/.github/workflows/bun-mac-x64.yml index c1aa25168..86c012373 100644 --- a/.github/workflows/bun-mac-x64.yml +++ b/.github/workflows/bun-mac-x64.yml @@ -263,7 +263,7 @@ jobs: OBJ_DIR: ${{ runner.temp }}/bun-cpp-obj BUN_DEPS_OUT_DIR: ${{runner.temp}}/bun-deps run: | - brew install rust llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force + brew install rust ccache llvm@13 pkg-config coreutils libtool cmake libiconv automake openssl@1.1 ninja gnu-sed pkg-config esbuild --force echo "export PATH=$(brew --prefix coreutils)/libexec/gnubin:\$PATH" >> $GITHUB_ENV echo "export PATH=$(brew --prefix llvm@13)/bin:\$PATH" >> $GITHUB_ENV brew link --overwrite llvm@13 @@ -297,6 +297,10 @@ jobs: with: name: ${{ matrix.obj }} path: ${{ runner.temp }}/release + - name: ccache (link) + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: ${{ runner.os }}-ccache-${{ matrix.tag }}-link - name: Link env: CPU_TARGET: ${{ matrix.cpu }} diff --git a/Dockerfile b/Dockerfile index 46853d70c..865a2899c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -214,7 +214,7 @@ ENV CCACHE_DIR=/ccache WORKDIR $BUN_DIR -RUN --mount=type=cache,target=/ccache make oniguruma && rm -rf src/deps/oniguruma Makefile +RUN --mount=type=cache,target=/ccache cd ${BUN_DIR} && make oniguruma && rm -rf src/deps/oniguruma Makefile FROM bun-base as tinycc @@ -253,7 +253,7 @@ WORKDIR $BUN_DIR ENV CCACHE_DIR=/ccache -RUN --mount=type=cache,target=/ccache make boringssl && rm -rf src/deps/boringssl Makefile +RUN --mount=type=cache,target=/ccache cd ${BUN_DIR} && make boringssl && rm -rf src/deps/boringssl Makefile FROM bun-base as uws |