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

Repackage stevedore artifact to remove builds in folder structure #1323

Merged
merged 1 commit into from
Jul 25, 2020
Merged

Repackage stevedore artifact to remove builds in folder structure #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion external/buildscripts/Build.bee.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private static void RegisterCommonArtifacts()
{
Artifacts.Add("MonoBleedingEdge",
new Tuple<string, string>(
"MonoBleedingEdge/fd0d97a7a35_5d627f842afebea942027a7fe8a590effb76deaf44736482b8bbcfae58316d42.7z",
"MonoBleedingEdge/f6eb9e15148_2a5566bb437c65d9af40d5f0f7fa4c2cc0f6e6efa243ae673bde2f5b29b03f08.7z",
"unity-internal"));

Artifacts.Add("reference-assemblies",
Expand Down
7 changes: 1 addition & 6 deletions external/buildscripts/build.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,7 @@
{
print(">>> External mono found at : $existingExternalMono\n");

if (-d "$existingExternalMono/builds")
{
print(">>> Mono found at at : $existingExternalMono/builds\n");
}

$existingMonoRootPath = "$existingExternalMono/builds/monodistribution";
$existingMonoRootPath = "$existingExternalMono/monodistribution";
}
else
{
Expand Down
11 changes: 2 additions & 9 deletions external/buildscripts/collect_allbuilds.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@

rmove('versions-aggregated.txt', 'versions.txt');

open(MYFILE,">built_by_teamcity.txt");
print MYFILE "These builds were created by teamcity from svn revision $ENV{BUILD_VCS_NUMBER}\n";
print MYFILE "TC projectname was: $ENV{TEAMCITY_PROJECT_NAME}\n";
print MYFILE "TC buildconfigname was: $ENV{TEAMCITY_BUILDCONF_NAME}\n";
close(MYFILE);

my $externalBuildDeps = "$monoroot/external/buildscripts/artifacts/Stevedore";
my $externalzip = "";
if($^O eq "linux")
Expand All @@ -77,12 +71,11 @@
{
rmtree("../stevedore");
my $stevedoreMbePath = "../stevedore/MonoBleedingEdge";
my $stevedoreMbeBuildsPath = "../stevedore/MonoBleedingEdge/builds";
my $stevedoreMbe7z = "../stevedore/MonoBleedingEdge.7z";
my $stevedoreMbeArtifactID = "../stevedore/artifactid.txt";

system("mkdir -p $stevedoreMbeBuildsPath") eq 0 or die("failed to mkdir $stevedoreMbeBuildsPath");
system("cp -r * $stevedoreMbeBuildsPath/") eq 0 or die ("failed copying builds to $stevedoreMbeBuildsPath\n");
system("mkdir -p $stevedoreMbePath") eq 0 or die("failed to mkdir $stevedoreMbePath");
system("cp -r * $stevedoreMbePath/") eq 0 or die ("failed copying builds to $stevedoreMbePath\n");
if(-f $externalzip)
{
system("$externalzip a $stevedoreMbe7z $stevedoreMbePath/* -sdel") eq 0 or die("failed 7z up $stevedoreMbePath");
Expand Down