From a0a1cfaabea5be7f120949e055bbe8829d99a1c2 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Thu, 14 May 2026 12:54:14 +0300 Subject: [PATCH] Update version and libs * OpenSSL 3.5.6 IB-8887 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 2 ++ CMakeLists.txt | 2 +- build.ps1 | 18 ++++++++++-------- vcpkg.json | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab672b3c..0c48e10c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,6 +63,8 @@ jobs: echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> "$GITHUB_ENV" echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> "$GITHUB_ENV" echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> "$GITHUB_ENV" + git -C $VCPKG_INSTALLATION_ROOT fetch origin f77737496dabd44c63ecc599dc0f4d6cff30d0d5 + git -C $VCPKG_INSTALLATION_ROOT reset --hard f77737496dabd44c63ecc599dc0f4d6cff30d0d5 - name: Cache vcpkg uses: actions/cache@v5 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 49b3ad76..657ea1cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ if(POLICY CMP0167) cmake_policy(SET CMP0167 NEW) endif() -project(libcdoc VERSION 0.5.0) +project(libcdoc VERSION 0.5.1) macro(SET_ENV NAME DEF) if(DEFINED ENV{${NAME}}) diff --git a/build.ps1 b/build.ps1 index f71a591b..414a69fe 100644 --- a/build.ps1 +++ b/build.ps1 @@ -4,19 +4,19 @@ param( [string]$platform = "x64", [string]$build_number = $(if ($null -eq $env:BUILD_NUMBER) {"0"} else {$env:BUILD_NUMBER}), [string]$git = "git.exe", - [string]$vcpkg = "vcpkg\vcpkg.exe", - [string]$vcpkg_dir = (split-path -parent $vcpkg), - [string]$vcpkg_installed = $libcdoc, - [string]$vcpkg_triplet = "x64-windows", - [string]$vcpkg_installed_platform = "$vcpkg_installed\vcpkg_installed", + [string]$vcpkg = $env:VCPKG_ROOT, + [string]$vcpkg_installed = $null, + [string]$vcpkg_installed_platform = $(if($vcpkg_installed) { "$vcpkg_installed\vcpkg_installed_$platform" } else { "$libdigidocpp\build\windows-$platform\vcpkg_installed" }), + [string]$vcpkg_triplet = "$platform-windows", [string]$cmake = "cmake.exe", [string]$generator = "Visual Studio 17 2022", [switch]$RunTests = $false, ) if(!(Test-Path -Path $vcpkg)) { - & $git clone https://github.com/microsoft/vcpkg.git $vcpkg_dir - & $vcpkg_dir\bootstrap-vcpkg.bat + $vcpkg = "$libdigidocpp\vcpkg" + & $git clone https://github.com/microsoft/vcpkg $vcpkg + & $vcpkg\bootstrap-vcpkg.bat } $cmakeext = @() @@ -29,9 +29,11 @@ if($RunTests) { } $buildpath = "build" +$env:PLATFORM = $platform +$env:VCPKG_ROOT = $vcpkg & $cmake --fresh -B $buildpath -S . "-G$generator" $cmakeext ` - "--toolchain $vcpkg_dir/scripts/buildsystems/vcpkg.cmake" ` + "--toolchain $vcpkg/scripts/buildsystems/vcpkg.cmake" ` "-DVCPKG_INSTALLED_DIR=$vcpkg_installed_platform" ` "-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet" diff --git a/vcpkg.json b/vcpkg.json index 7d1d57b5..a0c2d3e8 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -21,7 +21,7 @@ "features": { "tests": { "description": "Build tests", "dependencies": ["boost-test"] } }, - "builtin-baseline": "bc38a15b0bee8bc48a49ea267cc32fbb49aedfc4", + "builtin-baseline": "f77737496dabd44c63ecc599dc0f4d6cff30d0d5", "vcpkg-configuration": { "overlay-triplets": ["./vcpkg-triplets"], "registries": [ @@ -29,7 +29,7 @@ "kind": "git", "repository": "https://github.com/open-eid/vcpkg-ports", "reference": "vcpkg-registry", - "baseline": "316f4d642f489b7d23d97891ed73431e7394d749", + "baseline": "e841c32c534b9db3130a824992f4bacd79fae1bc", "packages": ["openssl"] } ]