internal/rosa/package/hakurei: 0.4.2 to 0.4.3
All checks were successful
Test / Create distribution (push) Successful in 1m5s
Test / Sandbox (push) Successful in 2m47s
Test / Hakurei (push) Successful in 3m48s
Test / ShareFS (push) Successful in 3m46s
Test / Sandbox (race detector) (push) Successful in 5m19s
Test / Hakurei (race detector) (push) Successful in 6m25s
Test / Flake checks (push) Successful in 1m20s
All checks were successful
Test / Create distribution (push) Successful in 1m5s
Test / Sandbox (push) Successful in 2m47s
Test / Hakurei (push) Successful in 3m48s
Test / ShareFS (push) Successful in 3m46s
Test / Sandbox (race detector) (push) Successful in 5m19s
Test / Hakurei (race detector) (push) Successful in 6m25s
Test / Flake checks (push) Successful in 1m20s
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -1,61 +0,0 @@
|
|||||||
From 2a9aa3b4007a73a6c9d4608cb9a8822247881fd6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ophestra <cat@gensokyo.uk>
|
|
||||||
Date: Thu, 21 May 2026 23:34:50 +0900
|
|
||||||
Subject: [PATCH] cmd/dist: include version in release
|
|
||||||
|
|
||||||
This makes HAKUREI_VERSION optional during build.
|
|
||||||
|
|
||||||
Signed-off-by: Ophestra <cat@gensokyo.uk>
|
|
||||||
---
|
|
||||||
cmd/dist/VERSION | 1 +
|
|
||||||
cmd/dist/main.go | 7 ++++++-
|
|
||||||
flake.nix | 1 -
|
|
||||||
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
||||||
create mode 100644 cmd/dist/VERSION
|
|
||||||
|
|
||||||
diff --git a/cmd/dist/VERSION b/cmd/dist/VERSION
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..0eec13e4
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/cmd/dist/VERSION
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+v0.4.2
|
|
||||||
diff --git a/cmd/dist/main.go b/cmd/dist/main.go
|
|
||||||
index 9ed7f2f8..d876cf83 100644
|
|
||||||
--- a/cmd/dist/main.go
|
|
||||||
+++ b/cmd/dist/main.go
|
|
||||||
@@ -18,8 +18,13 @@ import (
|
|
||||||
"os/signal"
|
|
||||||
"path/filepath"
|
|
||||||
"runtime"
|
|
||||||
+ "strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
+//go:generate sh -c "git describe --tags > VERSION"
|
|
||||||
+//go:embed VERSION
|
|
||||||
+var version string
|
|
||||||
+
|
|
||||||
// getenv looks up an environment variable, and returns fallback if it is unset.
|
|
||||||
func getenv(key, fallback string) string {
|
|
||||||
if v, ok := os.LookupEnv(key); ok {
|
|
||||||
@@ -47,7 +52,7 @@ func main() {
|
|
||||||
|
|
||||||
verbose := os.Getenv("VERBOSE") != ""
|
|
||||||
runTests := os.Getenv("HAKUREI_DIST_MAKE") == ""
|
|
||||||
- version := getenv("HAKUREI_VERSION", "untagged")
|
|
||||||
+ version = getenv("HAKUREI_VERSION", strings.TrimSpace(version))
|
|
||||||
prefix := getenv("PREFIX", "/usr")
|
|
||||||
destdir := getenv("DESTDIR", "dist")
|
|
||||||
|
|
||||||
diff --git a/flake.nix b/flake.nix
|
|
||||||
index 4de35204..09520be2 100644
|
|
||||||
--- a/flake.nix
|
|
||||||
+++ b/flake.nix
|
|
||||||
@@ -139,7 +139,6 @@
|
|
||||||
GOCACHE="$(mktemp -d)" \
|
|
||||||
PATH="${pkgs.pkgsStatic.musl.bin}/bin:$PATH" \
|
|
||||||
DESTDIR="$out" \
|
|
||||||
- HAKUREI_VERSION="v${hakurei.version}" \
|
|
||||||
./all.sh
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@@ -2,11 +2,11 @@ package hakurei-source {
|
|||||||
description = "hakurei source tree";
|
description = "hakurei source tree";
|
||||||
exclude = true;
|
exclude = true;
|
||||||
|
|
||||||
version* = "0.4.2";
|
version* = "0.4.3";
|
||||||
output = remoteTar {
|
output = remoteTar {
|
||||||
url = "https://git.gensokyo.uk/rosa/hakurei/archive/"+
|
url = "https://git.gensokyo.uk/rosa/hakurei/archive/"+
|
||||||
"v"+version+".tar.gz";
|
"v"+version+".tar.gz";
|
||||||
checksum = "jadgaOrxv5ABGvzQ_Rk0aPGz7U8K-427TbMhQNQ32scSizEnlR44Pu7NoWYWVZWq";
|
checksum = "1LqBJIcYcAFTVfydCahOm4hjjKhY953X9ars0eQj32hnpNncWFefuT6OJpZzIlZv";
|
||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,6 @@ package hakurei {
|
|||||||
anitya = 388834;
|
anitya = 388834;
|
||||||
|
|
||||||
source = hakurei-source;
|
source = hakurei-source;
|
||||||
patches = [ "2a9aa3b4007a73a6c9d4608cb9a8822247881fd6.patch" ];
|
|
||||||
enterSource = true;
|
enterSource = true;
|
||||||
writable = true;
|
writable = true;
|
||||||
chmod = true;
|
chmod = true;
|
||||||
@@ -84,7 +83,6 @@ package hakurei-dist {
|
|||||||
website = "https://hakurei.app";
|
website = "https://hakurei.app";
|
||||||
|
|
||||||
source = hakurei-source;
|
source = hakurei-source;
|
||||||
patches = [ "2a9aa3b4007a73a6c9d4608cb9a8822247881fd6.patch" ];
|
|
||||||
enterSource = true;
|
enterSource = true;
|
||||||
writable = true;
|
writable = true;
|
||||||
chmod = true;
|
chmod = true;
|
||||||
@@ -132,7 +130,6 @@ package earlyinit {
|
|||||||
exclude = true;
|
exclude = true;
|
||||||
|
|
||||||
source = hakurei-source;
|
source = hakurei-source;
|
||||||
patches = [ "2a9aa3b4007a73a6c9d4608cb9a8822247881fd6.patch" ];
|
|
||||||
enterSource = true;
|
enterSource = true;
|
||||||
writable = true;
|
writable = true;
|
||||||
chmod = true;
|
chmod = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user