From 88219eef1f34a53d83bd457facbec6c50e3017f9 Mon Sep 17 00:00:00 2001 From: Ian Eyberg Date: Tue, 9 Apr 2024 20:25:35 -0700 Subject: [PATCH 1/4] fix nightly x arch --- lepton/const.go | 38 ---------------------- lepton/nightly.go | 73 ++++++++++++++++++++++++++++++++++++++++++ lepton/nightly_test.go | 40 +++++++++++++++++++++++ 3 files changed, 113 insertions(+), 38 deletions(-) create mode 100644 lepton/nightly.go create mode 100644 lepton/nightly_test.go diff --git a/lepton/const.go b/lepton/const.go index 7bda450d..72698a86 100644 --- a/lepton/const.go +++ b/lepton/const.go @@ -133,9 +133,6 @@ func getImageTempDir(c *types.Config) string { return c.BuildDir } -// NightlyReleaseURLm give URL for nightly build. -var NightlyReleaseURLm = NightlyReleaseURL() - var realGOOS = getGOOS() // RealGOARCH is the underlying host architecture. @@ -157,41 +154,6 @@ func getGOOS() string { return goos } -func nightlyFileName() string { - if RealGOARCH == "arm64" || AltGOARCH == "arm64" { - return "nanos-nightly-linux-virt.tar.gz" - } - return "nanos-nightly-linux.tar.gz" -} - -func nightlyTimestamp() string { - if RealGOARCH == "arm64" || AltGOARCH == "arm64" { - return "nanos-nightly-linux-virt.timestamp" - } - return "nanos-nightly-linux.timestamp" -} - -// NightlyReleaseURL points to the latest nightly release url that is -// arch dependent upon flag set. -func NightlyReleaseURL() string { - var sb strings.Builder - sb.WriteString(nightlyReleaseBaseURL) - sb.WriteString(nightlyFileName()) - return sb.String() -} - -// NightlyLocalFolder points to the latest nightly release url that is -// arch dependent upon flag set. -func NightlyLocalFolder() string { - if RealGOARCH == "arm64" || AltGOARCH == "arm64" { - return path.Join(GetOpsHome(), "nightly-arm") - } - return path.Join(GetOpsHome(), "nightly") -} - -// NightlyLocalFolderm is directory path where nightly builds are stored -var NightlyLocalFolderm = NightlyLocalFolder() - // LocalTimeStamp gives local timestamp from download nightly build func LocalTimeStamp() (string, error) { timestamp := nightlyTimestamp() diff --git a/lepton/nightly.go b/lepton/nightly.go new file mode 100644 index 00000000..b2572d8c --- /dev/null +++ b/lepton/nightly.go @@ -0,0 +1,73 @@ +package lepton + +import ( + "path" + "strings" +) + +// NightlyReleaseURLm give URL for nightly build. +var NightlyReleaseURLm = NightlyReleaseURL() + +func nightlyFileName() string { + if AltGOARCH != "" { + if AltGOARCH == "arm64" { + return "nanos-nightly-linux-virt.tar.gz" + } + + return "nanos-nightly-linux.tar.gz" + + } else { + if RealGOARCH == "arm64" { + return "nanos-nightly-linux-virt.tar.gz" + } + + return "nanos-nightly-linux.tar.gz" + } +} + +func nightlyTimestamp() string { + if AltGOARCH != "" { + if AltGOARCH == "arm64" { + return "nanos-nightly-linux-virt.timestamp" + } + + return "nanos-nightly-linux.timestampz" + + } else { + if RealGOARCH == "arm64" { + return "nanos-nightly-linux-virt.timestamp" + } + + return "nanos-nightly-linux.timestamp" + } +} + +// NightlyReleaseURL points to the latest nightly release url that is +// arch dependent upon flag set. +func NightlyReleaseURL() string { + var sb strings.Builder + sb.WriteString(nightlyReleaseBaseURL) + sb.WriteString(nightlyFileName()) + return sb.String() +} + +// NightlyLocalFolder points to the latest nightly release url that is +// arch dependent upon flag set. +func NightlyLocalFolder() string { + if AltGOARCH != "" { + if AltGOARCH == "arm64" { + return path.Join(GetOpsHome(), "nightly-arm") + } + + return path.Join(GetOpsHome(), "nightly") + } else { + if RealGOARCH == "arm64" { + return path.Join(GetOpsHome(), "nightly-arm") + } + + return path.Join(GetOpsHome(), "nightly") + } +} + +// NightlyLocalFolderm is directory path where nightly builds are stored +var NightlyLocalFolderm = NightlyLocalFolder() diff --git a/lepton/nightly_test.go b/lepton/nightly_test.go new file mode 100644 index 00000000..e881bf9b --- /dev/null +++ b/lepton/nightly_test.go @@ -0,0 +1,40 @@ +package lepton + +import "testing" + +func TestNightlyFilename(t *testing.T) { + RealGOARCH = "amd64" + + fname := nightlyFileName() + + if fname != "nanos-nightly-linux.tar.gz" { + t.Fatalf("invalid nightly filename: %s", fname) + } + + RealGOARCH = "arm64" + + fname = nightlyFileName() + + if fname != "nanos-nightly-linux-virt.tar.gz" { + t.Fatalf("invalid nightly filename: %s", fname) + } + + RealGOARCH = "arm64" + AltGOARCH = "amd64" + + fname = nightlyFileName() + + if fname != "nanos-nightly-linux.tar.gz" { + t.Fatalf("invalid nightly filename: %s", fname) + } + + RealGOARCH = "amd64" + AltGOARCH = "arm64" + + fname = nightlyFileName() + + if fname != "nanos-nightly-linux-virt.tar.gz" { + t.Fatalf("invalid nightly filename: %s", fname) + } + +} From eca08a5b9e72fd7fd33e57889675c6cc42e69cbe Mon Sep 17 00:00:00 2001 From: Ian Eyberg Date: Tue, 9 Apr 2024 20:34:16 -0700 Subject: [PATCH 2/4] . --- lepton/nightly.go | 29 ++++++++++------------------- lepton/nightly_test.go | 16 ++++++++-------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/lepton/nightly.go b/lepton/nightly.go index b2572d8c..0d2b0d0d 100644 --- a/lepton/nightly.go +++ b/lepton/nightly.go @@ -8,38 +8,29 @@ import ( // NightlyReleaseURLm give URL for nightly build. var NightlyReleaseURLm = NightlyReleaseURL() -func nightlyFileName() string { +func nightlybase() string { if AltGOARCH != "" { if AltGOARCH == "arm64" { - return "nanos-nightly-linux-virt.tar.gz" + return "nanos-nightly-linux-virt" } - return "nanos-nightly-linux.tar.gz" + return "nanos-nightly-linux" } else { if RealGOARCH == "arm64" { - return "nanos-nightly-linux-virt.tar.gz" + return "nanos-nightly-linux-virt" } - return "nanos-nightly-linux.tar.gz" + return "nanos-nightly-linux" } } -func nightlyTimestamp() string { - if AltGOARCH != "" { - if AltGOARCH == "arm64" { - return "nanos-nightly-linux-virt.timestamp" - } - - return "nanos-nightly-linux.timestampz" - - } else { - if RealGOARCH == "arm64" { - return "nanos-nightly-linux-virt.timestamp" - } +func nightlyFileName() string { + return nightlybase() + ".tar.gz" +} - return "nanos-nightly-linux.timestamp" - } +func nightlyTimestamp() string { + return nightlybase() + ".timestamp" } // NightlyReleaseURL points to the latest nightly release url that is diff --git a/lepton/nightly_test.go b/lepton/nightly_test.go index e881bf9b..a4bfb7b1 100644 --- a/lepton/nightly_test.go +++ b/lepton/nightly_test.go @@ -5,35 +5,35 @@ import "testing" func TestNightlyFilename(t *testing.T) { RealGOARCH = "amd64" - fname := nightlyFileName() + fname := nightlybase() - if fname != "nanos-nightly-linux.tar.gz" { + if fname != "nanos-nightly-linux" { t.Fatalf("invalid nightly filename: %s", fname) } RealGOARCH = "arm64" - fname = nightlyFileName() + fname = nightlybase() - if fname != "nanos-nightly-linux-virt.tar.gz" { + if fname != "nanos-nightly-linux-virt" { t.Fatalf("invalid nightly filename: %s", fname) } RealGOARCH = "arm64" AltGOARCH = "amd64" - fname = nightlyFileName() + fname = nightlybase() - if fname != "nanos-nightly-linux.tar.gz" { + if fname != "nanos-nightly-linux" { t.Fatalf("invalid nightly filename: %s", fname) } RealGOARCH = "amd64" AltGOARCH = "arm64" - fname = nightlyFileName() + fname = nightlybase() - if fname != "nanos-nightly-linux-virt.tar.gz" { + if fname != "nanos-nightly-linux-virt" { t.Fatalf("invalid nightly filename: %s", fname) } From 834250f218d2cbf71b1144c204645f0b390c355e Mon Sep 17 00:00:00 2001 From: Ian Eyberg Date: Tue, 9 Apr 2024 20:58:12 -0700 Subject: [PATCH 3/4] . --- lepton/nightly.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lepton/nightly.go b/lepton/nightly.go index 0d2b0d0d..c3ca1039 100644 --- a/lepton/nightly.go +++ b/lepton/nightly.go @@ -16,13 +16,13 @@ func nightlybase() string { return "nanos-nightly-linux" - } else { - if RealGOARCH == "arm64" { - return "nanos-nightly-linux-virt" - } + } - return "nanos-nightly-linux" + if RealGOARCH == "arm64" { + return "nanos-nightly-linux-virt" } + + return "nanos-nightly-linux" } func nightlyFileName() string { From eb7c15746b8a95c5df00ca961e1b1928fdcbadc6 Mon Sep 17 00:00:00 2001 From: Ian Eyberg Date: Tue, 9 Apr 2024 21:04:48 -0700 Subject: [PATCH 4/4] . --- lepton/nightly.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lepton/nightly.go b/lepton/nightly.go index c3ca1039..12c8f4fe 100644 --- a/lepton/nightly.go +++ b/lepton/nightly.go @@ -51,13 +51,13 @@ func NightlyLocalFolder() string { } return path.Join(GetOpsHome(), "nightly") - } else { - if RealGOARCH == "arm64" { - return path.Join(GetOpsHome(), "nightly-arm") - } + } - return path.Join(GetOpsHome(), "nightly") + if RealGOARCH == "arm64" { + return path.Join(GetOpsHome(), "nightly-arm") } + + return path.Join(GetOpsHome(), "nightly") } // NightlyLocalFolderm is directory path where nightly builds are stored