Skip to content

Commit 27ff93e

Browse files
committed
Merge pull request 'v1.3.0 Releases' (PR#17) from dev into main
Reviewed-on: https://git.mczhengyi.top/zhengyi/halo-plugin-vditor/pulls/17
2 parents f1595ce + d268f0f commit 27ff93e

File tree

21 files changed

+1440
-1160
lines changed

21 files changed

+1440
-1160
lines changed

.gitea/workflows/workflow.yaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Build Plugin JAR File
33
on:
44
push:
55
branches: [ main, dev ]
6-
release:
7-
types:
8-
- created
96

107
jobs:
118
build:
@@ -41,15 +38,21 @@ jobs:
4138
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/console/pnpm-lock.yaml') }}
4239
restore-keys: |
4340
${{ runner.os }}-pnpm-store-
41+
- name: Download Vditor assets
42+
run: |
43+
chmod a+x download_dist.sh
44+
bash download_dist.sh
4445
- name: Install Frontend Dependencies
4546
run: |
4647
./gradlew pnpmInstall
4748
- name: Build with Gradle
4849
run: |
4950
# Set the version with tag name when releasing
50-
version=${{ github.event.release.tag_name }}
51-
version=${version#v}
52-
sed -i "s/version=.*-SNAPSHOT$/version=$version/1" gradle.properties
51+
if [ $GITHUB_REF_NAME == "main" ]; then
52+
version=${{ github.event.release.tag_name }}
53+
version=${version#v}
54+
sed -i "s/version=.*-SNAPSHOT$/version=$version/1" gradle.properties
55+
fi
5356
./gradlew clean build -x test
5457
- name: Archive plugin-starter jar
5558
uses: actions/upload-artifact@v3

.github/workflows/workflow.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ jobs:
4141
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/console/pnpm-lock.yaml') }}
4242
restore-keys: |
4343
${{ runner.os }}-pnpm-store-
44+
- name: Download Vditor assets
45+
run: |
46+
chmod a+x download_dist.sh
47+
bash download_dist.sh
4448
- name: Install Frontend Dependencies
4549
run: |
4650
./gradlew pnpmInstall

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ git clone git@github.com:{your_github_id}/vditor-mde.git
9696
cd path/to/plugin-starter
9797
```
9898

99+
```bash
100+
# 下载依赖包
101+
chmod a+x download_dist.sh
102+
./download_dist.sh
103+
```
104+
99105
```bash
100106
# macOS / Linux
101107
./gradlew pnpmInstall

console/.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@zhengyi:registry=https://git.mczhengyi.top/api/packages/zhengyi/npm/

console/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@halo-dev/components": "^1.7.0",
1515
"@halo-dev/console-shared": "^2.8.0",
1616
"canvas-confetti": "^1.6.0",
17-
"vditor": "^3.9.6",
17+
"@zhengyi/vditor": "^3.9.8",
1818
"vue": "^3.3.4"
1919
},
2020
"devDependencies": {

0 commit comments

Comments
 (0)