Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't fail on non-existant already installed ports. #516

Merged
merged 9 commits into from
May 23, 2022
Merged

Don't fail on non-existant already installed ports. #516

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b5b8d8
Don't fail on nonexistant installed ports.
Apr 22, 2022
c4acf8c
add e2e test
Apr 27, 2022
fc096b9
add Throw-IfFailed
Neumann-A Apr 27, 2022
e90ce35
Merge remote-tracking branch 'upstream/main' into ignore_nonexistent_…
May 4, 2022
44b6add
add 'if ($IsWindows)' and install another port for testing
May 4, 2022
3ff332c
Retain detailed error information when finding the baseline fails
ras0219-msft May 20, 2022
20b647e
apply diff from ci
Neumann-A May 20, 2022
b76271a
Avoid allocations in print_error_message
ras0219-msft May 23, 2022
6e1fed0
Fix print_error_message last. Include origin information in manifest …
ras0219-msft May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions azure-pipelines/end-to-end-tests-dir/build-test-ports.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@

$CurrentTest = "Build Test Ports"

Run-Vcpkg --overlay-ports="$PSScriptRoot/../e2e_ports/overlays" install vcpkg-empty-port
Run-Vcpkg --overlay-ports="$PSScriptRoot/../e2e_ports" install vcpkg-find-acquire-program
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
Throw-IfFailed
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion src/vcpkg/registries.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ namespace
return (*pscf)->to_version();
}
print_error_message(maybe_scf.error());
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
Checks::exit_maybe_upgrade(VCPKG_LINE_INFO, "Error: failed to load port from %s", port_path);
return nullopt;
}

void BuiltinFilesRegistry::get_all_port_names(std::vector<std::string>& out) const
Expand Down