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

This commit is contained in:
Vanessa 2022-05-31 18:00:31 +08:00
commit c5d58dc79f
4 changed files with 7 additions and 7 deletions

View file

@ -14,5 +14,5 @@ jobs:
- name: Build the Docker image
run: |
docker login --username=${{ secrets.DOCKER_HUB_USER }} --password=${{ secrets.DOCKER_HUB_PWD }}
docker build -t b3log/siyuan:latest -t b3log/siyuan:v2.0.14 .
docker build -t b3log/siyuan:latest -t b3log/siyuan:v2.0.15 .
docker push b3log/siyuan -a

View file

@ -9,7 +9,7 @@
<Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64"
Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
Version="2.0.14.0"/>
Version="2.0.15.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
<PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

View file

@ -1,6 +1,6 @@
{
"name": "SiYuan",
"version": "2.0.14",
"version": "2.0.15",
"description": "A local-first personal knowledge management system, supports fine-grained block-level reference, and Markdown WYSIWYG.",
"homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js",

View file

@ -34,12 +34,12 @@ import (
goPS "github.com/mitchellh/go-ps"
)
var Mode = "dev"
//var Mode = "prod"
//var Mode = "dev"
//
var Mode = "prod"
const (
Ver = "2.0.14"
Ver = "2.0.15"
IsInsider = false
)