sup39/firefish
1
0
Fork 0
forked from naskya/firefish
Code Issues Pull requests Activity

meta: update versioning format

Browse source
This commit is contained in:
naskya 2024-02-22 06:42:21 +09:00
parent 3b0d540101
commit dc9531322a
Signed by: naskya
GPG key ID: 712D413B3A9FED5C
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -128,7 +128,5 @@ build-image:
--no-cache \ --no-cache \
--platform linux/amd64 \ --platform linux/amd64 \
--build-arg "VERSION=$$(version_ci)" \ --build-arg "VERSION=$$(version_ci)" \
--tag docker.io/naskya/firefish \
--tag registry.code.naskya.net/naskya/firefish \ --tag registry.code.naskya.net/naskya/firefish \
--tag "registry.code.naskya.net/naskya/firefish:$$(version_ci | cut -d':' -f2)" \
. .

12
neko/update/utils
View file

@ -43,15 +43,11 @@ contains() {
} }
version() { 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')
COMMIT_DATE=$(git show --no-patch --pretty='%cs' FETCH_HEAD | sed -e 's/-//g' | cut -c 3-) printf '%s+neko' "${COMMIT_DATE}"
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}"
} }
version_ci() { 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')
COMMIT_DATE=$(git show --no-patch --pretty='%cs' HEAD | sed -e 's/-//g' | cut -c 3-) printf '%s+neko' "${COMMIT_DATE}"
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}"
} }

3
package.json
View file

@ -1,7 +1,6 @@
{ {
"name": "firefish", "name": "firefish",
"version": "1.0.5-rc", "version": "neko",
"codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://code.naskya.net/naskya/firefish" "url": "https://code.naskya.net/naskya/firefish"