diff --git a/.woodpecker/linux-release.yml b/.woodpecker/linux-release.yml
index 5f2a2e3..98f021a 100644
--- a/.woodpecker/linux-release.yml
+++ b/.woodpecker/linux-release.yml
@@ -15,17 +15,6 @@ when:
concurrency: 1
steps:
- # 前端只构建一次:两个架构的 Backend 构建并行跑在同一个工作目录里,各自 npm ci 会互相删 node_modules(ENOTEMPTY),
- # 一个失败还会把另一个的构建进程一起杀掉。Backend 把 web/*/dist 内嵌进程序(展示端和管理端由面板自己提供)。
- - name: web-build
- image: bash
- environment:
- NPM_CONFIG_CACHE: /home/justme/.npm
- commands:
- - npm ci --prefix web --prefer-offline
- - npm run build --prefix web
- depends_on: []
-
- name: linux-amd64-backend
image: bash
environment:
@@ -36,8 +25,7 @@ steps:
from_secret: zot_secret
commands:
- bash ci/release-linux.sh amd64 backend
- depends_on:
- - web-build
+ depends_on: []
- name: linux-arm64-backend
image: bash
@@ -48,9 +36,10 @@ steps:
ZOT_SECRET:
from_secret: zot_secret
commands:
+ # 两个架构共用一个工作目录:amd64 先构建并生成前端产物,arm64 在它之后(并行会同时 npm ci,互相删 node_modules)
- bash ci/release-linux.sh arm64 backend
depends_on:
- - web-build
+ - linux-amd64-backend
- name: backend-multiarch-index
image: bash
diff --git a/backend/Directory.Build.props b/backend/Directory.Build.props
index 7c03aee..f3fb195 100644
--- a/backend/Directory.Build.props
+++ b/backend/Directory.Build.props
@@ -13,7 +13,7 @@
true
$(MSBuildThisFileDirectory)artifacts
true
- 0.3.1
+ 0.3.2
false
diff --git a/web/package.json b/web/package.json
index ccd3fc1..ad4cc99 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,7 +1,7 @@
{
"name": "moshiro-web",
"private": true,
- "version": "0.3.1",
+ "version": "0.3.2",
"workspaces": [
"display",
"admin"