From 67298148038db804cbafb36ed58a8e0cd2777039 Mon Sep 17 00:00:00 2001 From: autoantwort Date: Thu, 26 Dec 2024 19:37:58 +0100 Subject: [PATCH 1/2] Test vcpkg-tool commit --- scripts/azure-pipelines/azure-pipelines.yml | 2 +- scripts/azure-pipelines/bootstrap-from-source.sh | 2 +- scripts/azure-pipelines/windows/bootstrap-from-source.cmd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 132e66793f35b6..5ecb4265fddaae 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -8,7 +8,7 @@ parameters: - name: vcpkgToolSha displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' type: string - default: 'use default' + default: '5eb34c2868054b91e4efd3bd8d471ac1ea48cd32' - name: tripletPattern displayName: 'Enable triplets which contain this substring' type: string diff --git a/scripts/azure-pipelines/bootstrap-from-source.sh b/scripts/azure-pipelines/bootstrap-from-source.sh index b998568eb8b23e..a42362612a1fb6 100755 --- a/scripts/azure-pipelines/bootstrap-from-source.sh +++ b/scripts/azure-pipelines/bootstrap-from-source.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git clone https://github.com/autoantwort/vcpkg-tool vcpkg-tool git -C vcpkg-tool switch -d $1 rm -rf build.x64.release cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x64.release -S vcpkg-tool diff --git a/scripts/azure-pipelines/windows/bootstrap-from-source.cmd b/scripts/azure-pipelines/windows/bootstrap-from-source.cmd index 8f8aae33748094..33c014725e7316 100644 --- a/scripts/azure-pipelines/windows/bootstrap-from-source.cmd +++ b/scripts/azure-pipelines/windows/bootstrap-from-source.cmd @@ -1,5 +1,5 @@ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86 -git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git clone https://github.com/autoantwort/vcpkg-tool vcpkg-tool git -C vcpkg-tool switch -d %1 rmdir /s /q build.x86.release > nul 2> nul cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x86.release -S vcpkg-tool From 35a5d0378b39b9c143267282cba43bec9f39a522 Mon Sep 17 00:00:00 2001 From: autoantwort Date: Thu, 26 Dec 2024 19:44:28 +0100 Subject: [PATCH 2/2] test change --- ports/sqlite3/portfile.cmake | 2 +- ports/sqlite3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 954afbdd7c943b..031fcedf74edb8 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES fix-arm-uwp.patch - add-config-include.patch + # add-config-include.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index eb2efa1e67f100..b5c73151494667 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlite3", "version": "3.47.2", + "port-version": 1, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index fd13fea6c4b5a1..29c0b8ec15f5d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8670,7 +8670,7 @@ }, "sqlite3": { "baseline": "3.47.2", - "port-version": 0 + "port-version": 1 }, "sqlitecpp": { "baseline": "3.3.2", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 91612162a4f53b..0938637ce73065 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1dff25f41046d9a41db474ea524f80073734543", + "version": "3.47.2", + "port-version": 1 + }, { "git-tree": "b22957f23065a61c8f640a9f9763b4fd48b63c01", "version": "3.47.2",