diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile index bb328b6dc..762ae302d 100644 --- a/dist/macOS/arm64.Dockerfile +++ b/dist/macOS/arm64.Dockerfile @@ -10,7 +10,7 @@ RUN cd / &&\ git clone --depth 1 https://github.com/Microsoft/vcpkg.git vcpkg &&\ cd /vcpkg &&\ ./bootstrap-vcpkg.sh -disableMetrics && \ - /vcpkg/vcpkg x-update-baseline + git -C /vcpkg pull ## Install make RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile index 71b3ba7af..3d9c35357 100644 --- a/dist/web/Dockerfile +++ b/dist/web/Dockerfile @@ -14,6 +14,7 @@ set -xe git clone https://github.com/microsoft/vcpkg /vcpkg /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 EOF @@ -34,7 +35,6 @@ set -xe mkdir -p $VCPKG_DEFAULT_BINARY_CACHE -/vcpkg/vcpkg x-update-baseline /vcpkg/vcpkg install --triplet=wasm32-emscripten libmagic /vcpkg/vcpkg install --triplet=wasm32-emscripten freetype /vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls diff --git a/vcpkg.json b/vcpkg.json index bb68d1b4c..71ed2f939 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg", "version": "1.0.0", - "builtin-baseline": "a0ea252731b13f28890fc4fb92a4eaa8ff19f201", + "builtin-baseline": "7e21420f775f72ae938bdeb5e6068f722088f06a", "dependencies": [ "libmagic", "freetype",