build: Fix vcpkg mess

This commit is contained in:
WerWolv
2025-08-12 21:04:46 +02:00
parent bd17e0edc1
commit e1d1c4acca
3 changed files with 7 additions and 7 deletions

View File

@@ -241,7 +241,7 @@ jobs:
- name: 📦 Install vcpkg
uses: friendlyanon/setup-vcpkg@v1
with: { committish: ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0 }
with: { committish: dd3097e305afa53f7b4312371f62058d2e665320 }
- name: ⬇️ Install dependencies
run: |

View File

@@ -53,13 +53,13 @@ RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y l
# -- DOWNLOADING + BUILDING STUFF
ENV VCPKG_DEFAULT_BINARY_CACHE /cache/vcpkg
COPY --from=imhex /dist/vcpkg.json /vcpkg.json
RUN --mount=type=cache,target=/cache <<EOF
RUN --mount=type=cache,target=/cache \
--mount=type=bind,source=.,target=/imhex <<EOF
## Install dependencies with vcpkg
set -xe
mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
cp /imhex/dist/vcpkg.json .
vcpkg install --triplet=arm-osx-mytriplet
EOF

6
dist/web/Dockerfile vendored
View File

@@ -29,13 +29,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
EOF
ENV VCPKG_DEFAULT_BINARY_CACHE=/cache/vcpkg
COPY --from=imhex /dist/vcpkg.json /vcpkg.json
RUN --mount=type=cache,target=/cache <<EOF
RUN --mount=type=cache,target=/cache \
--mount=type=bind,source=.,target=/imhex <<EOF
# Install dependencies with vcpkg
set -xe
mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
cp /imhex/dist/vcpkg.json .
/vcpkg/vcpkg install --triplet=wasm32-emscripten
EOF