Compare commits
2 commits
8fa30c7a15
...
dc9531322a
Author | SHA1 | Date | |
---|---|---|---|
dc9531322a | |||
3b0d540101 |
4 changed files with 6 additions and 13 deletions
2
Makefile
2
Makefile
|
@ -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)" \
|
|
||||||
.
|
.
|
||||||
|
|
|
@ -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}"
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -36,7 +36,7 @@ export default async (ctx: Router.RouterContext) => {
|
||||||
const pinnedNotes = (
|
const pinnedNotes = (
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
pinning.map((pinnedNote) =>
|
pinning.map((pinnedNote) =>
|
||||||
this.notesRepository.findOneByOrFail({ id: pinnedNote.noteId }),
|
Notes.findOneByOrFail({ id: pinnedNote.noteId }),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
).filter(
|
).filter(
|
||||||
|
|
Loading…
Reference in a new issue