diff --git a/.github/workflows/publish-atom.yaml b/.github/workflows/publish-atom.yaml index 214e67c5a..737145261 100644 --- a/.github/workflows/publish-atom.yaml +++ b/.github/workflows/publish-atom.yaml @@ -50,7 +50,7 @@ jobs: id: publish_to_atomgit run: | rm -rf ./packages/ui/certd-client/dist/**/*.gz - zip -r ui.zip ./packages/ui/certd-client/dist + cd ./packages/ui/certd-client/dist && zip -r ../../../ui.zip . export ATOMGIT_TOKEN=${{ secrets.ATOMGIT_TOKEN }} pnpm install npm run publish_to_atomgit diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml index cd58f95ac..bba1be8ca 100644 --- a/.github/workflows/release-image.yml +++ b/.github/workflows/release-image.yml @@ -135,7 +135,7 @@ jobs: id: publish_to_atomgit run: | rm -rf ./packages/ui/certd-client/dist/**/*.gz - zip -r ui.zip ./packages/ui/certd-client/dist + cd ./packages/ui/certd-client/dist && zip -r ../../../ui.zip . export ATOMGIT_TOKEN=${{ secrets.ATOMGIT_TOKEN }} pnpm install npm run publish_to_atomgit diff --git a/packages/ui/certd-server/.gitignore b/packages/ui/certd-server/.gitignore index 272b58bcd..cc653c1f3 100755 --- a/packages/ui/certd-server/.gitignore +++ b/packages/ui/certd-server/.gitignore @@ -22,4 +22,6 @@ run/ tools/lego/* !tools/lego/readme.md test.mjs -isolate-*.log \ No newline at end of file +isolate-*.log + +ui-*.zip \ No newline at end of file diff --git a/start.sh b/start.sh index 4c3ad6695..9b359ea77 100755 --- a/start.sh +++ b/start.sh @@ -57,16 +57,18 @@ echo "构建完成" echo "下载前端ui" # 如果zip有了就不下载 -if [ -f ui-$version.zip ]; then +if [ -f ./ui-$version.zip ]; then echo "ui-$version.zip 已经存在,不需要下载" else + echo "ui-$version.zip 不存在,开始下载" # 下载之前清理一下 rm -rf ui-*.zip # https://atomgit.com/certd/certd/releases/download/v1.37.16/ui-1.37.16.zip # 判断是否下载失败 wget https://atomgit.com/certd/certd/releases/download/v$version/ui-$version.zip +fi # 覆盖解压缩 -unzip -o ui-$version.zip -d ./public +unzip -o -q ui-$version.zip -d ./public echo "启动服务" diff --git a/trigger/publish.trigger b/trigger/publish.trigger index 1e8b31496..7f8f011eb 100644 --- a/trigger/publish.trigger +++ b/trigger/publish.trigger @@ -1 +1 @@ -6 +7