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.

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

nixos: correctly handle 24.11 #890

Merged
merged 1 commit into from
Nov 30, 2024
Merged
Changes from all commits
Commits
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
nixos: correctly handle 24.11
Signed-off-by: Adam Stephens <[email protected]>
adamcstephens committed Nov 30, 2024
commit e2a2567a5bb0e5d26460a101bbddfbbe0f3788ef
11 changes: 7 additions & 4 deletions sources/nixos-http.go
Original file line number Diff line number Diff line change
@@ -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)