Additional fixes to collect builds

Author: ashwinimurt

.gitlab-ci.yml

@@ -51,6 +51,10 @@ build_osx_classlibs:
   - perl external/buildscripts/build_classlibs_osx.pl
   - mkdir -p incomingbuilds/classlibs
   - cp -r ZippedClasslibs.tar.gz incomingbuilds/classlibs/
+  - cd incomingbuilds/classlibs
+  - tar -pzxf ZippedClasslibs.tar.gz
+  - rm -f ZippedClasslibs.tar.gz
+  - cd ../..
   artifacts:
     paths:
     - incomingbuilds/classlibs
@@ -72,7 +76,7 @@ build_android:
   - cd ../..
   - bash external/buildscripts/build_runtime_android.sh
   - mkdir -p incomingbuilds/android/
-  - cp -r builds/ incomingbuilds/android/
+  - cp -r builds/* incomingbuilds/android/
   artifacts:
     paths:
     - incomingbuilds/android
@@ -156,8 +160,8 @@ build_linux_x64:
   - ./bee
   - cd ../..
   - perl external/buildscripts/build_runtime_linux.pl -build64=1
-  - mkdir incomingbuilds/linux64
-  - cp -r builds/ incomingbuilds/linux64/
+  - mkdir -p incomingbuilds/linux64
+  - cp -r builds/* incomingbuilds/linux64/
   artifacts:
     paths:
     - incomingbuilds/linux64
@@ -179,7 +183,7 @@ build_linux_x86:
   - cd ../..
   - perl external/buildscripts/build_runtime_linux.pl
   - mkdir -p incomingbuilds/linux32
-  - cp -r builds/ incomingbuilds/linux32/
+  - cp -r builds/* incomingbuilds/linux32/
   artifacts:
     paths:
     - incomingbuilds/linux32
@@ -192,6 +196,7 @@ collate_builds:
   image: ubuntu:latest
   stage: collate
   dependencies:
+  - build_android
   - build_osx_runtime
   - build_osx_classlibs
   - build_win
@@ -203,5 +208,12 @@ collate_builds:
   - apt-get update -qy && apt-get -qy upgrade
   - apt-get install -qy perl
   - apt-get install -qy zip unzip
+  - apt-get install -qy p7zip-full p7zip-rar
   script:
-  - perl external/buildscripts/collect_allbuilds.pl
+  - perl external/buildscripts/collect_allbuilds.pl
+  - pwd
+  - ls -al 
+  artifacts:
+    paths:
+    - collectedbuilds/builds.7z
+    expire_in: 1 week

external/buildscripts/collect_allbuilds.pl

@@ -51,13 +51,19 @@
 
 system("zip -r builds.zip *") eq 0 or die("failed zipping up builds");
 
-if($^O eq "linux")
-{
-	system("$monoroot/../../mono-build-deps/build/7z/linux64/7za a builds.7z * -x!builds.zip") eq 0 or die("failed 7z up builds");
-}
-elsif($^O eq 'darwin')
+my $externalzip = "$monoroot/../../mono-build-deps/build/7z/linux64/7za";
+
+if($^O eq "linux" || $^O eq 'darwin')
 {
-	system("$monoroot/../../mono-build-deps/build/7z/osx/7za a builds.7z * -x!builds.zip") eq 0 or die("failed 7z up builds");
+	if(-f $externalzip)
+	{
+		system("$externalzip a builds.7z * -x!builds.zip") eq 0 or die("failed 7z up builds");
+	}
+	else
+	{
+		#Use 7z installed on the machine. If its not installed, please install it.
+		system("7z a builds.7z * -x!builds.zip") eq 0 or die("failed 7z up builds");
+	}
 }
 else
 {