Skip to content

Commit b6a6f7c

Browse files
committed
Add nuget.org to any custom nuget config file
It's the default; we expect customers to use it. But it's possible that the nuget.config file we use (eg, from source-build) has that removed so this force-adds it back.
1 parent d8d5e3c commit b6a6f7c

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,17 @@ jobs:
2424
dotnet_version:
2525
- "3.1"
2626
- "6.0"
27+
include:
28+
- container_image: quay.io/centos/centos:stream9-development
29+
dotnet_version: "7.0"
2730
exclude:
2831
- container_image: registry.fedoraproject.org/fedora:rawhide
2932
dotnet_version: "3.1"
3033
- container_image: registry.fedoraproject.org/fedora:37
3134
dotnet_version: "3.1"
35+
# alpine edge has openssl 1.1, not compatible with 3.1
36+
- container_image: docker.io/library/alpine:edge
37+
dotnet_version: "3.1"
3238

3339
container:
3440
image: ${{ matrix.container_image }}
@@ -143,7 +149,7 @@ jobs:
143149
144150
dotnet --info
145151
146-
dotnet turkey/Turkey.dll dotnet-regular-tests -v
152+
dotnet turkey/Turkey.dll dotnet-regular-tests -v --timeout 600
147153
148154
- name: Show Logs
149155
if: ${{ always() }}

Turkey/Program.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ public static async Task<int> Run(string testRoot,
112112

113113
Version packageVersion = dotnet.LatestRuntimeVersion;
114114
string nuGetConfig = await GenerateNuGetConfigIfNeededAsync(additionalFeed, packageVersion);
115+
if (verbose && nuGetConfig != null)
116+
{
117+
Console.WriteLine("Using nuget.config: ");
118+
Console.WriteLine(nuGetConfig);
119+
}
115120

116121
TestRunner runner = new TestRunner(
117122
cleaner: cleaner,
@@ -174,6 +179,11 @@ public static async Task<string> GenerateNuGetConfigIfNeededAsync(string additio
174179

175180
if (urls.Any() || nugetConfig != null)
176181
{
182+
// Add the default nuget repo that customer should always
183+
// be using anyway. This is the default, but still useful
184+
// if the nugetConfig has a <clear/> element that removes
185+
// it.
186+
urls.Add("https://api.nuget.org/v3/index.json");
177187
return await nuget.GenerateNuGetConfig(urls, nugetConfig);
178188
}
179189
}

0 commit comments

Comments
 (0)