From 7b5d44a32999acdae9f9854ecc413ec8f9e346be Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 18 Apr 2021 21:29:10 +0200 Subject: [PATCH 1/7] use official `gh` client instead of `github-release` to execute releases --- .idea/vcs.xml | 3 +- bin/release.sh | 51 +++++-------------- .../app/widgets/search_actions/delete_note.js | 2 +- 3 files changed, 14 insertions(+), 42 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 8fe5bdbdc..dcb6b8c4c 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - - \ No newline at end of file + diff --git a/bin/release.sh b/bin/release.sh index 80a53f771..78237077c 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -55,47 +55,20 @@ echo "Creating release in GitHub" EXTRA= if [[ $TAG == *"beta"* ]]; then - EXTRA=--pre-release + EXTRA=--prerelease fi -github-release release \ - --tag $TAG \ - --name "$TAG release" $EXTRA +echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token -echo "Uploading debian x64 package" - -github-release upload \ - --tag $TAG \ - --name "$DEBIAN_X64_BUILD" \ - --file "dist/$DEBIAN_X64_BUILD" - -echo "Uploading linux x64 build" - -github-release upload \ - --tag $TAG \ - --name "$LINUX_X64_BUILD" \ - --file "dist/$LINUX_X64_BUILD" - -echo "Uploading windows x64 build" - -github-release upload \ - --tag $TAG \ - --name "$WINDOWS_X64_BUILD" \ - --file "dist/$WINDOWS_X64_BUILD" - -echo "Uploading mac x64 build" - -github-release upload \ - --tag $TAG \ - --name "$MAC_X64_BUILD" \ - --file "dist/$MAC_X64_BUILD" - -echo "Uploading linux x64 server build" - -github-release upload \ - --tag $TAG \ - --name "$SERVER_BUILD" \ - --file "dist/$SERVER_BUILD" +gh release create "$TAG" \ + --title "$TAG release" \ + --notes "" + $EXTRA \ + "dist/$DEBIAN_X64_BUILD" \ + "dist/$LINUX_X64_BUILD" \ + "dist/$WINDOWS_X64_BUILD" \ + "dist/$MAC_X64_BUILD" \ + "dist/$SERVER_BUILD" echo "Building docker image" @@ -105,4 +78,4 @@ echo "Pushing docker image to dockerhub" bin/push-docker-image.sh $VERSION -echo "Release finished!" \ No newline at end of file +echo "Release finished!" diff --git a/src/public/app/widgets/search_actions/delete_note.js b/src/public/app/widgets/search_actions/delete_note.js index 9de251a4d..9e996dd4d 100644 --- a/src/public/app/widgets/search_actions/delete_note.js +++ b/src/public/app/widgets/search_actions/delete_note.js @@ -5,7 +5,7 @@ const TPL = ` - Delete matched note + Delete matched notes From bb16840a72f61ba558d35f12e4ad297c59cb0e3f Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 18 Apr 2021 21:30:43 +0200 Subject: [PATCH 2/7] release 0.46.8 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index 31aecc327..3ca681a85 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-04-03T22:37:04+02:00", buildRevision: "ef37a52a06b471e60f9c0f11da704283bbcef6ab" }; +module.exports = { buildDate:"2021-04-18T21:30:43+02:00", buildRevision: "7b5d44a32999acdae9f9854ecc413ec8f9e346be" }; From aedb05cbab0592fe385123cd7c70e786e0a734dc Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 18 Apr 2021 21:39:01 +0200 Subject: [PATCH 3/7] release 0.46.8 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index 3ca681a85..cfdc1791f 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-04-18T21:30:43+02:00", buildRevision: "7b5d44a32999acdae9f9854ecc413ec8f9e346be" }; +module.exports = { buildDate:"2021-04-18T21:39:00+02:00", buildRevision: "bb16840a72f61ba558d35f12e4ad297c59cb0e3f" }; From ec36fbd83eb4585115daa0eca6dc6fb6da43d3b1 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 18 Apr 2021 21:46:35 +0200 Subject: [PATCH 4/7] release 0.46.8 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index cfdc1791f..e8bb9e71f 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-04-18T21:39:00+02:00", buildRevision: "bb16840a72f61ba558d35f12e4ad297c59cb0e3f" }; +module.exports = { buildDate:"2021-04-18T21:46:35+02:00", buildRevision: "aedb05cbab0592fe385123cd7c70e786e0a734dc" }; From a8d72c46e45c3e3b7861f4cf95ffdcf2d11a0282 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 18 Apr 2021 21:47:45 +0200 Subject: [PATCH 5/7] release 0.46.8 --- src/services/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/build.js b/src/services/build.js index e8bb9e71f..2f2ab8b18 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2021-04-18T21:46:35+02:00", buildRevision: "aedb05cbab0592fe385123cd7c70e786e0a734dc" }; +module.exports = { buildDate:"2021-04-18T21:47:45+02:00", buildRevision: "ec36fbd83eb4585115daa0eca6dc6fb6da43d3b1" }; From c29f1af48feaa95ee905891bda831254d82633cf Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 19 Apr 2021 20:26:58 +0200 Subject: [PATCH 6/7] use n to force node version (cherry picked from commit 51d1d8efb8017cc44f5a842dc49acccc056e8149) --- bin/copy-trilium.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index 578d8b989..5032aeea5 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then exit 1 fi -npm run webpack +n exec 12 npm run webpack DIR=$1 @@ -27,7 +27,7 @@ cp -r electron.js $DIR/ cp webpack-* $DIR/ # run in subshell (so we return to original dir) -(cd $DIR && npm install --only=prod) +(cd $DIR && n exec 12 npm install --only=prod) # cleanup of useless files in dependencies rm -r $DIR/node_modules/image-q/demo From a674a127063d520afac96bec90d364b545897b1a Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 19 Apr 2021 20:56:05 +0200 Subject: [PATCH 7/7] disable tar polluting build log --- bin/build-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-server.sh b/bin/build-server.sh index a15032fa1..8f909eb20 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -10,7 +10,7 @@ fi cd dist wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz -tar xvfJ node-v${NODE_VERSION}-linux-x64.tar.xz +tar xfJ node-v${NODE_VERSION}-linux-x64.tar.xz rm node-v${NODE_VERSION}-linux-x64.tar.xz cd ..