Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable' into stable

Browse Source
This commit is contained in:
zadam
2021-04-21 20:38:15 +02:00
parent dc6a530d8c a674a12706
commit dc7c64a94d
6 changed files with 18 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-server.sh
View File

@@ -10,7 +10,7 @@ fi
cd dist cd dist
wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz 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 rm node-v${NODE_VERSION}-linux-x64.tar.xz
cd .. cd ..

4
bin/copy-trilium.sh
View File

@@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
exit 1 exit 1
fi fi
npm run webpack n exec 12 npm run webpack
DIR=$1 DIR=$1
@@ -27,7 +27,7 @@ cp -r electron.js $DIR/
cp webpack-* $DIR/ cp webpack-* $DIR/
# run in subshell (so we return to original 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 # cleanup of useless files in dependencies
rm -r $DIR/node_modules/image-q/demo rm -r $DIR/node_modules/image-q/demo

49
bin/release.sh
View File

@@ -55,47 +55,20 @@ echo "Creating release in GitHub"
EXTRA= EXTRA=
if [[ $TAG == *"beta"* ]]; then if [[ $TAG == *"beta"* ]]; then
EXTRA=--pre-release EXTRA=--prerelease
fi fi
github-release release \ echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token
--tag $TAG \
--name "$TAG release" $EXTRA
echo "Uploading debian x64 package" gh release create "$TAG" \
--title "$TAG release" \
github-release upload \ --notes ""
--tag $TAG \ $EXTRA \
--name "$DEBIAN_X64_BUILD" \ "dist/$DEBIAN_X64_BUILD" \
--file "dist/$DEBIAN_X64_BUILD" "dist/$LINUX_X64_BUILD" \
"dist/$WINDOWS_X64_BUILD" \
echo "Uploading linux x64 build" "dist/$MAC_X64_BUILD" \
"dist/$SERVER_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"
echo "Building docker image" echo "Building docker image"

2
src/public/app/widgets/search_actions/delete_note.js
View File

@@ -5,7 +5,7 @@ const TPL = `
<td colspan="2"> <td colspan="2">
<span class="bx bx-trash"></span> <span class="bx bx-trash"></span>
Delete matched note Delete matched notes
</td> </td>
<td class="button-column"> <td class="button-column">
<span class="bx bx-x icon-action action-conf-del"></span> <span class="bx bx-x icon-action action-conf-del"></span>

2
src/services/build.js
View File

@@ -1 +1 @@
module.exports = { buildDate:"2021-04-03T22:37:04+02:00", buildRevision: "ef37a52a06b471e60f9c0f11da704283bbcef6ab" }; module.exports = { buildDate:"2021-04-18T21:47:45+02:00", buildRevision: "ec36fbd83eb4585115daa0eca6dc6fb6da43d3b1" };