Merge pull request #890 from adamcstephens/nixos/24.11-prep

nixos: correctly handle 24.11
lxc · Nov 30, 2024 · 04abbcf · 04abbcf
2 parents 2618b56 + e2a2567
commit 04abbcf
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/sources/nixos-http.go b/sources/nixos-http.go
@@ -15,13 +15,16 @@ func (s *nixos) Run() error {
 	hydraProject := "nixos"
 
 	hydraJobset := fmt.Sprintf("release-%s", s.definition.Image.Release)
-	releaseAttr := "lxdContainerImage"
-	hydraBuildProduct := "system-tarball"
+	releaseAttr := "incusContainerImage"
+	hydraBuildProduct := "squashfs-image"
+
+	if s.definition.Image.Release == "24.05" {
+		releaseAttr = "lxdContainerImage"
+		hydraBuildProduct = "system-tarball"
+	}
 
 	if s.definition.Image.Release == "unstable" {
 		hydraJobset = "trunk-combined"
-		releaseAttr = "incusContainerImage"
-		hydraBuildProduct = "squashfs-image"
 	}
 
 	hydraJob := fmt.Sprintf("nixos.%s.%s-linux", releaseAttr, s.definition.Image.ArchitectureMapped)