Skip to content

Change Nuget binary cache pre-release info to always start with letters #14857

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

Merged
BillyONeal merged 3 commits into from
Dec 4, 2020
Merged

Change Nuget binary cache pre-release info to always start with letters #14857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
544267f
Change Nuget pre-release to build metadata
frivard-coveo Nov 30, 2020
767e0f5
Revert "Change Nuget pre-release to build metadata"
frivard-coveo Nov 30, 2020
1b6ed6f
Prepend some letters to the pre-release info
frivard-coveo Nov 30, 2020
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
42 changes: 21 additions & 21 deletions toolsrc/src/vcpkg-test/binarycaching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,28 @@ using namespace vcpkg;

TEST_CASE ("reformat_version semver-ish", "[reformat_version]")
{
REQUIRE(reformat_version("0.0.0", "abitag") == "0.0.0-abitag");
REQUIRE(reformat_version("1.0.1", "abitag") == "1.0.1-abitag");
REQUIRE(reformat_version("1.01.000", "abitag") == "1.1.0-abitag");
REQUIRE(reformat_version("1.2", "abitag") == "1.2.0-abitag");
REQUIRE(reformat_version("v52", "abitag") == "52.0.0-abitag");
REQUIRE(reformat_version("v09.01.02", "abitag") == "9.1.2-abitag");
REQUIRE(reformat_version("1.1.1q", "abitag") == "1.1.1-abitag");
REQUIRE(reformat_version("1", "abitag") == "1.0.0-abitag");
REQUIRE(reformat_version("0.0.0", "abitag") == "0.0.0-vcpkgabitag");
REQUIRE(reformat_version("1.0.1", "abitag") == "1.0.1-vcpkgabitag");
REQUIRE(reformat_version("1.01.000", "abitag") == "1.1.0-vcpkgabitag");
REQUIRE(reformat_version("1.2", "abitag") == "1.2.0-vcpkgabitag");
REQUIRE(reformat_version("v52", "abitag") == "52.0.0-vcpkgabitag");
REQUIRE(reformat_version("v09.01.02", "abitag") == "9.1.2-vcpkgabitag");
REQUIRE(reformat_version("1.1.1q", "abitag") == "1.1.1-vcpkgabitag");
REQUIRE(reformat_version("1", "abitag") == "1.0.0-vcpkgabitag");
}

TEST_CASE ("reformat_version date", "[reformat_version]")
{
REQUIRE(reformat_version("2020-06-26", "abitag") == "2020.6.26-abitag");
REQUIRE(reformat_version("20-06-26", "abitag") == "0.0.0-abitag");
REQUIRE(reformat_version("2020-06-26-release", "abitag") == "2020.6.26-abitag");
REQUIRE(reformat_version("2020-06-26000", "abitag") == "2020.6.26-abitag");
REQUIRE(reformat_version("2020-06-26", "abitag") == "2020.6.26-vcpkgabitag");
REQUIRE(reformat_version("20-06-26", "abitag") == "0.0.0-vcpkgabitag");
REQUIRE(reformat_version("2020-06-26-release", "abitag") == "2020.6.26-vcpkgabitag");
REQUIRE(reformat_version("2020-06-26000", "abitag") == "2020.6.26-vcpkgabitag");
}

TEST_CASE ("reformat_version generic", "[reformat_version]")
{
REQUIRE(reformat_version("apr", "abitag") == "0.0.0-abitag");
REQUIRE(reformat_version("", "abitag") == "0.0.0-abitag");
REQUIRE(reformat_version("apr", "abitag") == "0.0.0-vcpkgabitag");
REQUIRE(reformat_version("", "abitag") == "0.0.0-vcpkgabitag");
}

TEST_CASE ("generate_nuspec", "[generate_nuspec]")
Expand Down Expand Up @@ -96,7 +96,7 @@ Build-Depends: bzip

NugetReference ref(ipa);

REQUIRE(ref.nupkg_filename() == "zlib2_x64-windows.1.5.0-packageabi.nupkg");
REQUIRE(ref.nupkg_filename() == "zlib2_x64-windows.1.5.0-vcpkgpackageabi.nupkg");

{
auto nuspec = generate_nuspec(paths, ipa, ref, {});
Expand All @@ -108,7 +108,7 @@ Build-Depends: bzip
std::string expected = R"(<package>
<metadata>
<id>zlib2_x64-windows</id>
<version>1.5.0-packageabi</version>
<version>1.5.0-vcpkgpackageabi</version>
<authors>vcpkg</authors>
<description>NOT FOR DIRECT USE. Automatically generated cache package.

Expand Down Expand Up @@ -140,7 +140,7 @@ Features: a, b
std::string expected = R"(<package>
<metadata>
<id>zlib2_x64-windows</id>
<version>1.5.0-packageabi</version>
<version>1.5.0-vcpkgpackageabi</version>
<authors>vcpkg</authors>
<description>NOT FOR DIRECT USE. Automatically generated cache package.

Expand Down Expand Up @@ -172,7 +172,7 @@ Features: a, b
std::string expected = R"(<package>
<metadata>
<id>zlib2_x64-windows</id>
<version>1.5.0-packageabi</version>
<version>1.5.0-vcpkgpackageabi</version>
<authors>vcpkg</authors>
<description>NOT FOR DIRECT USE. Automatically generated cache package.

Expand Down Expand Up @@ -267,7 +267,7 @@ Description: a spiffy compression library wrapper
packageconfig = generate_nuget_packages_config(plan);
REQUIRE(packageconfig == R"(<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="zlib_x64-android" version="1.5.0-packageabi"/>
<package id="zlib_x64-android" version="1.5.0-vcpkgpackageabi"/>
</packages>
)");

Expand All @@ -290,8 +290,8 @@ Description: a spiffy compression library wrapper
packageconfig = generate_nuget_packages_config(plan);
REQUIRE(packageconfig == R"(<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="zlib_x64-android" version="1.5.0-packageabi"/>
<package id="zlib2_x64-android" version="1.52.0-packageabi2"/>
<package id="zlib_x64-android" version="1.5.0-vcpkgpackageabi"/>
<package id="zlib2_x64-android" version="1.52.0-vcpkgpackageabi2"/>
</packages>
)");
}
6 changes: 3 additions & 3 deletions toolsrc/src/vcpkg/binarycaching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ std::string vcpkg::reformat_version(const std::string& version, const std::strin
auto major = trim_leading_zeroes(sm.str(1));
auto minor = sm.size() > 2 && !sm.str(2).empty() ? trim_leading_zeroes(sm.str(2).substr(1)) : "0";
auto patch = sm.size() > 3 && !sm.str(3).empty() ? trim_leading_zeroes(sm.str(3).substr(1)) : "0";
return Strings::concat(major, '.', minor, '.', patch, "-", abi_tag);
return Strings::concat(major, '.', minor, '.', patch, "-vcpkg", abi_tag);
}

static const std::regex date_matcher(R"((\d\d\d\d)-(\d\d)-(\d\d).*)");
Expand All @@ -1190,11 +1190,11 @@ std::string vcpkg::reformat_version(const std::string& version, const std::strin
trim_leading_zeroes(sm.str(2)),
'.',
trim_leading_zeroes(sm.str(3)),
"-",
"-vcpkg",
abi_tag);
}

return Strings::concat("0.0.0-", abi_tag);
return Strings::concat("0.0.0-vcpkg", abi_tag);
}

details::NuGetRepoInfo details::get_nuget_repo_info_from_env()
Expand Down