about summary refs log tree commit diff
path: root/maintainers/upload-release.pl
diff options
context:
space:
mode:
Diffstat (limited to 'maintainers/upload-release.pl')
-rwxr-xr-xmaintainers/upload-release.pl16
1 files changed, 12 insertions, 4 deletions
diff --git a/maintainers/upload-release.pl b/maintainers/upload-release.pl
index 743829e3f5f3..aa7633a709c1 100755
--- a/maintainers/upload-release.pl
+++ b/maintainers/upload-release.pl
@@ -6,6 +6,7 @@ use Data::Dumper;
 use File::Basename;
 use File::Path;
 use File::Slurp;
+use File::Copy;
 use JSON::PP;
 use LWP::UserAgent;
 
@@ -54,7 +55,7 @@ sub downloadFile {
 
     my $buildInfo = decode_json(fetch("$evalUrl/job/$jobName", 'application/json'));
 
-    my $srcFile = $buildInfo->{buildproducts}->{$productNr}->{path} or die;
+    my $srcFile = $buildInfo->{buildproducts}->{$productNr}->{path} or die "job '$jobName' lacks product $productNr\n";
     $dstName //= basename($srcFile);
     my $dstFile = "$releaseDir/" . $dstName;
 
@@ -78,11 +79,11 @@ sub downloadFile {
     return ($dstFile, $sha256_expected);
 }
 
-downloadFile("tarball", "2"); # PDF
-downloadFile("tarball", "3"); # .tar.bz2
-my ($tarball, $tarballHash) = downloadFile("tarball", "4"); # .tar.xz
+downloadFile("tarball", "2"); # .tar.bz2
+my ($tarball, $tarballHash) = downloadFile("tarball", "3"); # .tar.xz
 my ($tarball_i686_linux, $tarball_i686_linux_hash) = downloadFile("binaryTarball.i686-linux", "1");
 my ($tarball_x86_64_linux, $tarball_x86_64_linux_hash) = downloadFile("binaryTarball.x86_64-linux", "1");
+my ($tarball_aarch64_linux, $tarball_aarch64_linux_hash) = downloadFile("binaryTarball.aarch64-linux", "1");
 my ($tarball_x86_64_darwin, $tarball_x86_64_darwin_hash) = downloadFile("binaryTarball.x86_64-darwin", "1");
 
 # Update Nixpkgs in a very hacky way.
@@ -111,6 +112,7 @@ write_file("$nixpkgsDir/nixos/modules/installer/tools/nix-fallback-paths.nix",
            "{\n" .
            "  x86_64-linux = \"" . getStorePath("build.x86_64-linux") . "\";\n" .
            "  i686-linux = \"" . getStorePath("build.i686-linux") . "\";\n" .
+           "  aarch64-linux = \"" . getStorePath("build.aarch64-linux") . "\";\n" .
            "  x86_64-darwin = \"" . getStorePath("build.x86_64-darwin") . "\";\n" .
            "}\n");
 
@@ -144,9 +146,15 @@ write_file("$siteDir/nix-release.tt",
            "latestNixVersion = \"$version\"\n" .
            "nix_hash_i686_linux = \"$tarball_i686_linux_hash\"\n" .
            "nix_hash_x86_64_linux = \"$tarball_x86_64_linux_hash\"\n" .
+           "nix_hash_aarch64_linux = \"$tarball_aarch64_linux_hash\"\n" .
            "nix_hash_x86_64_darwin = \"$tarball_x86_64_darwin_hash\"\n" .
            "-%]\n");
 
 system("cd $siteDir && nix-shell --run 'make nix/install nix/install.sig'") == 0 or die;
 
+copy("$siteDir/nix/install", "$siteDir/nix/install-$version") or die;
+copy("$siteDir/nix/install.sig", "$siteDir/nix/install-$version.sig") or die;
+
+system("cd $siteDir && git add nix/install-$version nix/install-$version.sig") == 0 or die;
+
 system("cd $siteDir && git commit -a -m 'Nix $version released'") == 0 or die;