imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-28 07:47:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix vcpkg mess

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

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

6
dist/macOS/arm64.Dockerfile vendored
View File

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

6
dist/web/Dockerfile vendored
View File

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