From d60335d2f23100675e7f109dc36ed843bab0d557 Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Thu, 4 Dec 2025 17:30:31 +0000 Subject: [PATCH] Configuration - Update VCPKG version (#878) - Updates VCPKG baseline and version tag to 2025.10.17 - Adds new VCPKG install options for exact version matching and post-build cleanup - Adds macOS build dependencies (autoconf-archive and libtool) --- .github/actions/vcpkg-setup/action.yml | 7 +++++-- adm/vcpkg/ports/opencascade/vcpkg-configuration.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/vcpkg-setup/action.yml b/.github/actions/vcpkg-setup/action.yml index 8a904b2f19..c6240cba97 100644 --- a/.github/actions/vcpkg-setup/action.yml +++ b/.github/actions/vcpkg-setup/action.yml @@ -5,7 +5,7 @@ inputs: vcpkg-tag: description: 'vcpkg tag to checkout' required: false - default: '2025.06.13' + default: '2025.10.17' github-token: description: 'GitHub token for NuGet package access' required: true @@ -22,6 +22,7 @@ runs: echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/Open-Cascade-SAS/index.json,readwrite" >> $GITHUB_ENV echo "VCPKG_FEATURE_FLAGS=binarycaching,manifests,versions" >> $GITHUB_ENV echo "VCPKG_DISABLE_COMPILER_TRACKING=1" >> $GITHUB_ENV + echo "VCPKG_INSTALL_OPTIONS=--x-abi-tools-use-exact-versions;--clean-after-build" >> $GITHUB_ENV shell: bash if: runner.os != 'Windows' @@ -34,6 +35,7 @@ runs: echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/Open-Cascade-SAS/index.json,readwrite" >> $env:GITHUB_ENV echo "VCPKG_FEATURE_FLAGS=binarycaching,manifests,versions" >> $env:GITHUB_ENV echo "VCPKG_DISABLE_COMPILER_TRACKING=1" >> $env:GITHUB_ENV + echo "VCPKG_INSTALL_OPTIONS=--x-abi-tools-use-exact-versions;--clean-after-build" >> $env:GITHUB_ENV shell: pwsh if: runner.os == 'Windows' @@ -65,9 +67,10 @@ runs: brew install mono || true brew install openexr || true brew install --cask xquartz || true + brew install autoconf-archive || true + brew install libtool || true shell: bash - - name: Set up vcpkg (Unix) if: runner.os != 'Windows' run: | diff --git a/adm/vcpkg/ports/opencascade/vcpkg-configuration.json b/adm/vcpkg/ports/opencascade/vcpkg-configuration.json index 4e4500b4b2..682978dbdf 100644 --- a/adm/vcpkg/ports/opencascade/vcpkg-configuration.json +++ b/adm/vcpkg/ports/opencascade/vcpkg-configuration.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json", "default-registry": { "kind": "git", - "baseline": "2ddc10c8afa00a762a69f21f6427849fe906ede0", + "baseline": "74e6536215718009aae747d86d84b78376bf9e09", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [