Merge pull request #57 from mweinelt/aarch64-isos

Copy aarch64-linux ISO images unconditionally
This commit is contained in:
Domen Kožar 2022-10-13 10:43:09 +01:00 committed by GitHub
commit 368edf64f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -210,27 +210,23 @@ if ($bucketReleases && $bucketReleases->head_key("$releasePrefix")) {
} }
if ($channelName =~ /nixos/) { if ($channelName =~ /nixos/) {
my $arch = "x86_64-linux";
if ($channelName =~ /-aarch64/) {
$arch = "aarch64-linux";
}
downloadFile("nixos.channel", "nixexprs.tar.xz"); downloadFile("nixos.channel", "nixexprs.tar.xz");
downloadFile("nixos.iso_minimal.$arch");
downloadFile("nixpkgs.tarball", "packages.json.br", "json-br"); downloadFile("nixpkgs.tarball", "packages.json.br", "json-br");
downloadFile("nixos.options", "options.json.br", "json-br");
# Only built on the main channel (x86_64-linux) downloadFile("nixos.iso_minimal.aarch64-linux");
if ($arch eq "x86_64-linux") { downloadFile("nixos.iso_minimal.x86_64-linux");
downloadFile("nixos.options", "options.json.br", "json-br");
}
# All of these paths are x86-specific only and are not in small channels # All of these jobs are not present in small channels
if ($arch eq "x86_64-linux" and $channelName !~ /-small/) { if ($channelName !~ /-small/) {
downloadFile("nixos.iso_plasma5.$arch"); downloadFile("nixos.iso_plasma5.aarch64-linux");
downloadFile("nixos.iso_gnome.$arch"); downloadFile("nixos.iso_plasma5.x86_64-linux");
downloadFile("nixos.iso_gnome.aarch64-linux");
downloadFile("nixos.iso_gnome.x86_64-linux");
downloadFile("nixos.iso_minimal.i686-linux"); downloadFile("nixos.iso_minimal.i686-linux");
downloadFile("nixos.ova.$arch"); downloadFile("nixos.ova.x86-64-linux");
} }
} else { } else {