From 2a42024b53ebb512fb5dd63c523338bf26c8489c Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 7 Jan 2021 18:04:11 -0800 Subject: [vcpkg] Add commands to maintain and verify versions db integrity (#14999) * [vcpkg] Add x-ci-verify-versions command * Code cleanup * Remove port version splitting from x-history * Fix wrong message on success * Parallelize versions file generator * Use cpu_count()/2 to avoid crashes * Check db SHA against local SHA * Check baseline version with x-ci-verify-versions and make baseline generator much faster * Implement x-add-version to update version db files * Better checks for x-add-info and make x-ci-verify-versions silent on success * Use find() instead of [] on maps * Create version file if does not exist * Allow redirection of ports/ and port_versions/ * add test ports * WIP end-to-end tests * Change pats in e2e tests * Fix e2e args * e2e once more * Pass ersions feature flag to e2e * Exit with code 1 if there are errors * Files to test for failure cases * Update test files * Add test for x-add-version * fix redirected ports in last test * Add CI check (use dummy data) * Add feature-flags=versions * Ignore subdirectories inside ports * Add --verify-git-trees switch * [vcpkg] Fix build breaks * [x-ci-verify-versions] PR comments * [x-add-version] PR comments * Fix merge conflicts * Modify tests and pipeline * Baselines should only have version-string * Refactor x-add-version * [vcpkg] Fix help message * [vcpkg] Fix minor warnings * `x-add-version --all` doesn't stop on first failure and reduced default verbosity * [vcpkg] Fix default-baseline * Load file instead of using paths provider * Format * Remove ci test * Add fish port for testing * Update version files * Update fish port to cause SHA discrepancy * Test for discrepancy between local SHA and declared SHA * Missing = operator * Check for error message since x-add-version exits with code 0 * Make x-add-version fail with non-zero exit code if not run with --all Co-authored-by: Robert Schumacher Co-authored-by: Robert Schumacher --- .../default-baseline-2/port_versions/z-/zlib.json | 14 ++++++++++++++ .../testing/version-files/default-baseline-2/vcpkg.json | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json create mode 100644 scripts/testing/version-files/default-baseline-2/vcpkg.json (limited to 'scripts/testing/version-files/default-baseline-2') diff --git a/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json b/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json new file mode 100644 index 000000000..f5ee7cb9d --- /dev/null +++ b/scripts/testing/version-files/default-baseline-2/port_versions/z-/zlib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7bb2b2f3783303a4dd41163553fe4cc103dc9262", + "version-string": "1.2.11", + "port-version": 9 + }, + { + "git-tree": "4927735fa9baca564ebddf6e6880de344b20d7a8", + "version-string": "1.2.11", + "port-version": 8 + } + ] +} \ No newline at end of file diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json new file mode 100644 index 000000000..1e41002ff --- /dev/null +++ b/scripts/testing/version-files/default-baseline-2/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "default-baseline-test", + "version-string": "0", + "$x-default-baseline": "cbd5a68012471f820b7cf28d618199b4a4d89c58", + "dependencies": [ + "zlib" + ] +} \ No newline at end of file -- cgit v1.2.3