Skip to content

Create zip at location where CI is looking for it. #144

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
merged 3 commits into from
Mar 25, 2023
Merged

Create zip at location where CI is looking for it. #144

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
14a57d7
Create zip at location where CI is looking for it.
UnityAlex Mar 24, 2023
5f1910b
Turning off quiet because it is preventing CI from showing why things…
UnityAlex Mar 24, 2023
8165434
Comment out Iran timezone tests (#83916)
jkotas Mar 25, 2023
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
4 changes: 3 additions & 1 deletion src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ public static IEnumerable<object[]> Platform_TimeZoneNamesTestData()
{ TimeZoneInfo.FindSystemTimeZoneById(s_strPacific), "(UTC-08:00) Pacific Time (Los Angeles)", "Pacific Standard Time", "Pacific Daylight Time" },
{ TimeZoneInfo.FindSystemTimeZoneById(s_strSydney), "(UTC+10:00) Eastern Australia Time (Sydney)", "Australian Eastern Standard Time", "Australian Eastern Daylight Time" },
{ TimeZoneInfo.FindSystemTimeZoneById(s_strPerth), "(UTC+08:00) Australian Western Standard Time (Perth)", "Australian Western Standard Time", "Australian Western Daylight Time" },
{ TimeZoneInfo.FindSystemTimeZoneById(s_strIran), "(UTC+03:30) Iran Time", "Iran Standard Time", "Iran Daylight Time" },

// https://github.com/dotnet/runtime/issues/83901 The name is not same accross different OS updates.
// { TimeZoneInfo.FindSystemTimeZoneById(s_strIran), "(UTC+03:30) Iran Time", "Iran Standard Time", "Iran Daylight Time" },

{ s_NewfoundlandTz, "(UTC-03:30) Newfoundland Time (St. John’s)", "Newfoundland Standard Time", "Newfoundland Daylight Time" },
{ s_catamarcaTz, "(UTC-03:00) Argentina Standard Time (Catamarca)", "Argentina Standard Time", "Argentina Summer Time" }
Expand Down
2 changes: 0 additions & 2 deletions unity/CITools/BuildDriver/CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public static void Build(GlobalConfig gConfig)
"-subset clr+libs",
$"-a {gConfig.Architecture}",
$"-c {gConfig.Configuration}",
$"-v:{gConfig.DotNetVerbosity}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this removed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we were getting zero feedback from failing builds.

};

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down Expand Up @@ -108,7 +107,6 @@ private static void TestClassLibraries(GlobalConfig gConfig)
"-test /p:RunSmokeTestsOnly=true",
$"-a {gConfig.Architecture}",
$"-c {gConfig.Configuration}",
$"-v:{gConfig.DotNetVerbosity}"
};

if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down
2 changes: 1 addition & 1 deletion unity/CITools/BuildDriver/SevenZip.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static void Zip(NPath zipExe, NPath artifacts, GlobalConfig gConfig)
{
NPath zipArtifact = new (Environment.GetEnvironmentVariable("ARTIFACT_FILENAME") ??
$"dotnet-unity-{gConfig.Architecture}.7z");
SevenZip.Create7z(zipExe, artifacts, Paths.Artifacts.Combine(zipArtifact));
SevenZip.Create7z(zipExe, artifacts, Paths.Artifacts.Combine("unity", zipArtifact));
}

public static void Get7ZipUrl(out string url, out string filename)
Expand Down