From b30eb630d1b55bd12690ed08ce6b29121d4fdf1d Mon Sep 17 00:00:00 2001 From: Roman Kharitonov Date: Thu, 12 Nov 2026 18:01:32 +1000 Subject: [PATCH] Qualify vcpkg 2026.10.16 Select the released registry snapshot, align the explicit baseline checks and Dependabot rollback floor, and refresh the changed test's license content address. The complete x86/x64 host and target dependency graphs match the prior snapshot. Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-Authored-By: Codex (gpt-6.1-sol) --- .github/dependabot.yml | 2 +- .../unpackrat-build-tests-godot-minimal-registration.yml | 4 ++-- .../firstparty_artifacts.json | 6 +++--- build/tests/test_dependabot_configuration.py | 9 +++++---- build/tests/test_dependency_updates.py | 2 +- build/tests/test_godot_minimal_registration.py | 2 +- build/tests/test_workflow_provisioning.py | 2 +- docs/build-system.md | 4 ++-- vcpkg.json | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 289a072..7ddb8e3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ "ignore": [ { "dependency-name": "github.com/microsoft/vcpkg", - "versions": ["<=2026.10.15"] + "versions": ["<=2026.10.16"] } ], "schedule": { diff --git a/.ort/package-configurations/unpackrat-build-tests-godot-minimal-registration.yml b/.ort/package-configurations/unpackrat-build-tests-godot-minimal-registration.yml index 75a34d7..572fe92 100644 --- a/.ort/package-configurations/unpackrat-build-tests-godot-minimal-registration.yml +++ b/.ort/package-configurations/unpackrat-build-tests-godot-minimal-registration.yml @@ -1,6 +1,6 @@ { - "id": "SpdxDocumentFile:vcpkg:unpackrat-build-tests-godot-minimal-registration:400179e08a3580f4a824e9e51dea71db7d0ab55596e2e52ad05cf0a14e2a756a", - "source_artifact_url": "http://127.0.0.1:8765/sources/400179e08a3580f4a824e9e51dea71db7d0ab55596e2e52ad05cf0a14e2a756a.tar", + "id": "SpdxDocumentFile:vcpkg:unpackrat-build-tests-godot-minimal-registration:d213197f852ae31709506a4cbcfbbf9f86b051fd12061aa3c204642fc510aadc", + "source_artifact_url": "http://127.0.0.1:8765/sources/d213197f852ae31709506a4cbcfbbf9f86b051fd12061aa3c204642fc510aadc.tar", "license_finding_curations": [ { "path": "build/tests/test_godot_minimal_registration.py", diff --git a/build/tests/fixtures/license_package_configurations/firstparty_artifacts.json b/build/tests/fixtures/license_package_configurations/firstparty_artifacts.json index 57d87a7..c8d5d25 100644 --- a/build/tests/fixtures/license_package_configurations/firstparty_artifacts.json +++ b/build/tests/fixtures/license_package_configurations/firstparty_artifacts.json @@ -82,9 +82,9 @@ { "name": "unpackrat-build-tests-godot-minimal-registration", "member": "build/tests/test_godot_minimal_registration.py", - "version": "400179e08a3580f4a824e9e51dea71db7d0ab55596e2e52ad05cf0a14e2a756a", - "sha256": "400179e08a3580f4a824e9e51dea71db7d0ab55596e2e52ad05cf0a14e2a756a", - "artifact_filename": "400179e08a3580f4a824e9e51dea71db7d0ab55596e2e52ad05cf0a14e2a756a.tar", + "version": "d213197f852ae31709506a4cbcfbbf9f86b051fd12061aa3c204642fc510aadc", + "sha256": "d213197f852ae31709506a4cbcfbbf9f86b051fd12061aa3c204642fc510aadc", + "artifact_filename": "d213197f852ae31709506a4cbcfbbf9f86b051fd12061aa3c204642fc510aadc.tar", "extension": ".tar", "curations": [ { diff --git a/build/tests/test_dependabot_configuration.py b/build/tests/test_dependabot_configuration.py index 985d1d3..983a85e 100644 --- a/build/tests/test_dependabot_configuration.py +++ b/build/tests/test_dependabot_configuration.py @@ -26,7 +26,7 @@ def test_root_vcpkg_updates_run_weekly_in_the_local_timezone(self) -> None: "allow": [{"dependency-name": "github.com/microsoft/vcpkg"}], "ignore": [{ "dependency-name": "github.com/microsoft/vcpkg", - "versions": ["<=2026.10.15"], + "versions": ["<=2026.10.16"], }], "schedule": { "interval": "weekly", @@ -44,11 +44,12 @@ def test_baseline_prs_skip_older_releases_and_keep_future_releases_eligible(self self.assertEqual(ignored["dependency-name"], "github.com/microsoft/vcpkg") constraint, = ignored["versions"] cutoff = datetime.strptime(constraint, "<=%Y.%m.%d").date() - # The pinned registry commit is from 2026-10-15. Dependabot compares + # The pinned registry release is from 2026-10-16. Dependabot compares # release tags rather than commit ancestry, so guard the snapshot date. - self.assertEqual(cutoff.isoformat(), "2026-10-15") + self.assertEqual(cutoff.isoformat(), "2026-10-16") for tag, should_ignore in (("2026.07.29", True), ("2026.10.14", True), - ("2026.10.15", True), ("2026.10.16", False), + ("2026.10.15", True), ("2026.10.16", True), + ("2026.10.17", False), ("2027.01.01", False)): with self.subTest(tag=tag): self.assertEqual(datetime.strptime(tag, "%Y.%m.%d").date() <= cutoff, should_ignore) diff --git a/build/tests/test_dependency_updates.py b/build/tests/test_dependency_updates.py index 67cb561..70dbc26 100644 --- a/build/tests/test_dependency_updates.py +++ b/build/tests/test_dependency_updates.py @@ -45,7 +45,7 @@ def test_overlay_patches_survive_a_fresh_git_checkout_without_crlf(self) -> None def test_manifest_selects_the_updated_dependencies_and_registry(self) -> None: manifest = json.loads((REPOSITORY / "vcpkg.json").read_text(encoding="utf-8")) - self.assertEqual(manifest["builtin-baseline"], "20ceb8adbf0504d4b0d5e4058a32f9d4fc896391") + self.assertEqual(manifest["builtin-baseline"], "9eec002df1cd109f8f104cd966a763daf9751489") dependencies = {dependency["name"]: dependency for dependency in manifest["dependencies"]} for name, version in (("catch2", "3.16.1"), ("xxhash", "0.8.4"), ("mbedtls", "4.1.1")): with self.subTest(dependency=name): diff --git a/build/tests/test_godot_minimal_registration.py b/build/tests/test_godot_minimal_registration.py index 0eb5e99..b0efb07 100644 --- a/build/tests/test_godot_minimal_registration.py +++ b/build/tests/test_godot_minimal_registration.py @@ -46,7 +46,7 @@ GODOT = "godot" GODOT_VERSION = "1.2.1" GODOT_GUID = "{9C2F5E4A-7B31-4D58-8E27-1A6C4F0B9D34}" -BASELINE = "20ceb8adbf0504d4b0d5e4058a32f9d4fc896391" +BASELINE = "9eec002df1cd109f8f104cd966a763daf9751489" WOLFRPG = "wolfrpg" WOLFRPG_VERSION = "1.0.1" diff --git a/build/tests/test_workflow_provisioning.py b/build/tests/test_workflow_provisioning.py index 2a0e103..03bfa07 100644 --- a/build/tests/test_workflow_provisioning.py +++ b/build/tests/test_workflow_provisioning.py @@ -39,7 +39,7 @@ } CPPCHECK_MSI_SHA = "3929162bab7e71d1b9b18708ec054fb0188bfc8ea1660979ed95837f5a9f547b" VCPKG_EXE_SHA = "2a4ae1467b9e797964c60c919d057b9e5dc1ec03f4b9632c1150026db25201f2" -VCPKG_BASELINE = "20ceb8adbf0504d4b0d5e4058a32f9d4fc896391" +VCPKG_BASELINE = "9eec002df1cd109f8f104cd966a763daf9751489" LLVM_ASSET_SHA = "9ee6a2192fbb30c776415af529927f76ca6b5d1d55699bb1315f9878e610b5b8" diff --git a/docs/build-system.md b/docs/build-system.md index f97f9ac..0259e2c 100644 --- a/docs/build-system.md +++ b/docs/build-system.md @@ -153,8 +153,8 @@ modules. `Asia/Vladivostok`, with at most one open update PR. Dependabot proposes a new root `vcpkg.json` `builtin-baseline` when a newer vcpkg release tag is available. Its allow list selects only the registry baseline; Renovate tracks individual library versions below. The current baseline -is an October 15, 2026 snapshot newer than the latest tagged release, so an ignore rule excludes -release versions through `2026.10.15` to prevent a rollback. When deliberately selecting another +is the October 16, 2026 tagged release, and an ignore rule excludes +release versions through `2026.10.16` to prevent a rollback. When deliberately selecting another snapshot baseline, advance this floor to that commit's date. Future release dates remain eligible. Dependabot does not update the source revisions or hashes in the local overlay ports. The configuration uses JSON syntax, which is valid YAML and can be checked with the diff --git a/vcpkg.json b/vcpkg.json index cff0f2a..4ae0204 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,7 +2,7 @@ "name": "unpackrat", "version-string": "1.0.0", "license": "MIT", - "builtin-baseline": "20ceb8adbf0504d4b0d5e4058a32f9d4fc896391", + "builtin-baseline": "9eec002df1cd109f8f104cd966a763daf9751489", "dependencies": [ { "name": "yy-thunks",