Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-19 03:34:23 +01:00
Code Releases Wiki Activity

build: Properly update vcpkg pages in web and macOS ARM docker

Browse Source
This commit is contained in:
WerWolv 2025-02-07 23:34:05 +01:00
parent 94a2f9460e
commit a1634fb337
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/macOS/arm64.Dockerfile vendored
View File

@ -10,7 +10,7 @@ RUN cd / &&\
git clone --depth 1 https://github.com/Microsoft/vcpkg.git vcpkg &&\ git clone --depth 1 https://github.com/Microsoft/vcpkg.git vcpkg &&\
cd /vcpkg &&\ cd /vcpkg &&\
./bootstrap-vcpkg.sh -disableMetrics && \ ./bootstrap-vcpkg.sh -disableMetrics && \
/vcpkg/vcpkg x-update-baseline git -C /vcpkg pull
## Install make ## Install make
RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make

2
dist/web/Dockerfile vendored
View File

@ -14,6 +14,7 @@ set -xe
git clone https://github.com/microsoft/vcpkg /vcpkg git clone https://github.com/microsoft/vcpkg /vcpkg
/vcpkg/bootstrap-vcpkg.sh /vcpkg/bootstrap-vcpkg.sh
git -C /vcpkg pull
sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake
EOF EOF
@ -34,7 +35,6 @@ set -xe
mkdir -p $VCPKG_DEFAULT_BINARY_CACHE mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
/vcpkg/vcpkg x-update-baseline
/vcpkg/vcpkg install --triplet=wasm32-emscripten libmagic /vcpkg/vcpkg install --triplet=wasm32-emscripten libmagic
/vcpkg/vcpkg install --triplet=wasm32-emscripten freetype /vcpkg/vcpkg install --triplet=wasm32-emscripten freetype
/vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls /vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls

2
vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "vcpkg", "name": "vcpkg",
"version": "1.0.0", "version": "1.0.0",
"builtin-baseline": "a0ea252731b13f28890fc4fb92a4eaa8ff19f201", "builtin-baseline": "7e21420f775f72ae938bdeb5e6068f722088f06a",
"dependencies": [ "dependencies": [
"libmagic", "libmagic",
"freetype", "freetype",