From 597f7506959ff1267d615b36c9e316394a5e15c9 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Sun, 12 May 2024 15:59:05 +0200 Subject: [PATCH 1/2] fix: dockerfile --- Dockerfile | 1 - release.sh | 7 +++++-- src/lib/assets/icon.png | Bin 2545 -> 0 bytes 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 src/lib/assets/icon.png diff --git a/Dockerfile b/Dockerfile index d845650..52715d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ WORKDIR /app # copy dependency list COPY package.json pnpm-lock.yaml run/entrypoint.sh ./ -COPY patches ./patches COPY prisma ./prisma # Setup pnpm, install Prisma CLI (for generating client) and install dependencies diff --git a/release.sh b/release.sh index 06abc7b..deea692 100755 --- a/release.sh +++ b/release.sh @@ -1,5 +1,8 @@ -#!/usr/bin/env bash +#!/bin/bash set -e +cd "$(dirname "$0")" + +pnpm i CHANGELOG="CHANGELOG.md" @@ -19,7 +22,7 @@ fi editor "$CHANGELOG" -git add "$CHANGELOG" +git add package.json pnpm-lock.yaml "$CHANGELOG" git commit -m "chore(release): release v$VERSION" awk 'BEGIN{RS="(^|\n)## [^\n]+\n*"} NR==2 { print }' "$CHANGELOG" | git tag -as -F - --cleanup whitespace "$TAG" diff --git a/src/lib/assets/icon.png b/src/lib/assets/icon.png deleted file mode 100644 index 33a689f6131289f89f102b5fa24594b12b408294..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2545 zcmaJ@c{mi>8$L5;m=G#6m@5pGec!Vr#&(NP7&V2EeI47BW$H>7jmf@+7CU3yf$<4%A5{<^YDvNS!;iRJ_V95*+^+OQ(& zry$6%*rAnuCo)@k6m^u3;)y zv<##in91Y%VTzYB>}ZSQt&4lp_XZZ_{~T=FOj+w$oH;D^$YzhDmFy}QBs&&>2NG~T zVQJE=83bm^DW+uuI+CD>M1F$+&W&M@z`%dPo?5yat7LuG5>6az-93urh-U7k%NOcA zE^(9k&Lo{!DKN55Jqwbs;>y~ps(-kK@0<9+n;5GEFbxmjZ2ue_C~0{pREUf+^4jZh zoQkdOZ098108Dhko9kq+4^Kqemw(uuG-UG3(oU>6r1paYaNyUluWD->jf%tSFEXUI zwMjkm!~{MS1aVz;4u)|Zn*XP{w+T}TrQs{rys}ZCn(VHl;nq~-NxfCI4F*kU$7X-r z)hsXj$m1kir2(5&H#8#s{tpT(P%p`Qm$?g*RM%^3+KBflm#HdJUz!mi15WTlma|#NUdM3NjCJNb?QkG zBGCeRe4-o4tzaah2;sLR8prm9$qce{{zUQr0Q_Gmd01xL!=b<*9D*V{ptmciwXcSs zNY}$Fre}Pjseaedy&H}M>-mbJVk#4mnWSxN<{o7epQ~Q&%4=W-o!@50Zc*BfMmikb ziPDMpqgx*3C30ov&qooc3pIFNrBhsUGm&l2MW(WFh>r4NEBevt9iAgJe8B#A+0b>I z3F*zQQY?qQfm}q&u4>E~rKoKQZMg`pB2lPKuK-QwfFn3!GT-s%r$45~G5?eso%b(hMX@d!(2 ztWqEc*zK;{o91$;{nBZ33q6?G&i~lhlUfeYa5x(L|(*o|J@2yU08^Nsj;fsU$?#UaY)EiUF&Tn2B zwbyx%Wqz{E*C$)#XarWWmz0*?pR|Zp8CY79dC(!YeHT|#0U{$KGqbXucl$CLk&;(} zh^>E(t?y5W_%Rp^^6oBiV5Hi`0fNAIcze6VyXk37ypZBtT3X7yedGFd+Gw(LIubaE zvJX7fW-ET*OXbNQBzk#FE|N+UbGI6NsS>BMDAOPl#{UbYIo%SwV>2?C0=k)-44 zDB!dPUs_(KkF+4Z) z_?~Z+oxQ!wSmn(Rv;eKgI$^6{Ml18i4M{x|QI~*#C+G&>NeyA0qM55>4$+4e78Xhy zD?V9HToAA&RG-%gmcQkPbjpa1n~=7)LMy0L>vrj*Z9BFmpCLSxKdYRCZWU%o*hu*n%6!@#K2*cOq8D}p&-JZO)lR7kH>~JFt^n=+S8%j zyu2=6Uh!yqM@L>;wxwoyPub*e_d#8O1`mVqKc|$`6I%C!TmW>TGf6(->dE{L5 z^7t)QdxBuf$_OZf-8_`t=vxEk1%y4j6789&r(hyX}qE6NaR; zG-Pl{2#YVv%WYfUVRXD!_`28+g53%eauEi`d6LJL-`r>8Xx+@sY+FiQ2lf*Lz1K){u`DvQb8sY_@ zzrSBQw}E2vk`}pNpNL%G#lU|zc_}C&GO)Kv=X5<6!w=s2s(6g3Mk^ZOAg^+}7;Vvx z8Ri8Je0C(CjKEObzCRWRA-&@*D)KCfn!T!ls6!rDoY&D&R#AB!5k1@01rtv~ES5bs z_JE)S1nBzMkDTjh=(idZ6#;zf)mzY^s^%xIf1VOCrz4(8{i#N27Juo9&R9!L05MOl z5dTIB8C!qR)O1bB=t(bnA(fb%oa_mV8zlu&dfvZ(e>S^lcrCb}PeG4V*?Uo@`II@?U}Nw{ezQ-cBZ}tGvn-o{GeFzq_k@?At(}YI@v=HWosL`Km5{k zDo^W8h^&?fg(4llApsmWe0qv>C1Q3YlHT6TBL`d%;3JzHm6k320`%t@>ExXca{8Du8ra0BDzYi%w6)bM zEAvxs2B$6}9K>ROV From e634919e4363b3bb21b61b1c3f469ed59d9dc0e5 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Sun, 12 May 2024 18:09:08 +0200 Subject: [PATCH 2/2] chore: improve release script --- release.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/release.sh b/release.sh index deea692..40b930f 100755 --- a/release.sh +++ b/release.sh @@ -2,7 +2,21 @@ set -e cd "$(dirname "$0")" +if [ -n "$(git status --porcelain)" ]; then + echo "Uncommitted changes" + exit 1 +fi + +if [[ ! "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Invalid version '$1'"; + exit 1; +fi + +# Update package version +contents="$(jq ".version = \"$1\"" package.json)" +echo -E "${contents}" > package.json pnpm i +git add package.json pnpm-lock.yaml CHANGELOG="CHANGELOG.md" @@ -22,7 +36,7 @@ fi editor "$CHANGELOG" -git add package.json pnpm-lock.yaml "$CHANGELOG" +git add "$CHANGELOG" git commit -m "chore(release): release v$VERSION" awk 'BEGIN{RS="(^|\n)## [^\n]+\n*"} NR==2 { print }' "$CHANGELOG" | git tag -as -F - --cleanup whitespace "$TAG"