From dc9531322abf215a4b1a656ea819b4eff0fcaaa9 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 22 Feb 2024 06:42:21 +0900
Subject: [PATCH] meta: update versioning format

---
 Makefile          |  2 --
 neko/update/utils | 12 ++++--------
 package.json      |  3 +--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index ea86c8f0..d10fccd9 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,5 @@ build-image:
 	  --no-cache \
 	  --platform linux/amd64 \
 	  --build-arg "VERSION=$$(version_ci)" \
-	  --tag docker.io/naskya/firefish \
 	  --tag registry.code.naskya.net/naskya/firefish \
-	  --tag "registry.code.naskya.net/naskya/firefish:$$(version_ci | cut -d':' -f2)" \
 	  .
diff --git a/neko/update/utils b/neko/update/utils
index 315eef5a..e90d1c75 100644
--- a/neko/update/utils
+++ b/neko/update/utils
@@ -43,15 +43,11 @@ contains() {
 }
 
 version() {
-  UPSTREAM_VERSION=$(pnpm pkg get version | sed -e 's/"//g')
-  COMMIT_DATE=$(git show --no-patch --pretty='%cs' FETCH_HEAD | sed -e 's/-//g' | cut -c 3-)
-  COMMIT_HASH_INITIAL=$(printf '%s' "$(git rev-parse FETCH_HEAD)" | cut -c 1-2)
-  printf '%s+neko:%s.%s' "${UPSTREAM_VERSION}" "${COMMIT_DATE}" "${COMMIT_HASH_INITIAL}"
+  COMMIT_DATE=$(git show --no-patch --pretty='%cs' FETCH_HEAD | sed -e 's/-//g')
+  printf '%s+neko' "${COMMIT_DATE}"
 }
 
 version_ci() {
-  UPSTREAM_VERSION=$(grep '"version":' package.json | cut -d '"' -f 4)
-  COMMIT_DATE=$(git show --no-patch --pretty='%cs' HEAD | sed -e 's/-//g' | cut -c 3-)
-  COMMIT_HASH_INITIAL=$(printf '%s' "$(git rev-parse HEAD)" | cut -c 1-2)
-  printf '%s+neko:%s.%s' "${UPSTREAM_VERSION}" "${COMMIT_DATE}" "${COMMIT_HASH_INITIAL}"
+  COMMIT_DATE=$(git show --no-patch --pretty='%cs' HEAD | sed -e 's/-//g')
+  printf '%s+neko' "${COMMIT_DATE}"
 }
diff --git a/package.json b/package.json
index 1109fae5..0c69a30e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
 	"name": "firefish",
-	"version": "1.0.5-rc",
-	"codename": "aqua",
+	"version": "neko",
 	"repository": {
 		"type": "git",
 		"url": "https://code.naskya.net/naskya/firefish"