From 763f0e9c8553c189d417e134e2da8cfae611b812 Mon Sep 17 00:00:00 2001 From: fengyc Date: Thu, 19 Dec 2024 22:16:07 +0800 Subject: [PATCH] ci: fix ci --- .github/workflows/build-gnu.yml | 2 +- .github/workflows/build-musl.yml | 2 +- .github/workflows/build-other.yml | 4 ++-- scripts/aur/build-aur.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-gnu.yml b/.github/workflows/build-gnu.yml index 1d11260..8a4b2b6 100644 --- a/.github/workflows/build-gnu.yml +++ b/.github/workflows/build-gnu.yml @@ -45,7 +45,7 @@ jobs: with: name: pisugar-web path: | - electron/dist + pisugar-webui/dist - name: Update env env: diff --git a/.github/workflows/build-musl.yml b/.github/workflows/build-musl.yml index c073c01..eb3a9e1 100644 --- a/.github/workflows/build-musl.yml +++ b/.github/workflows/build-musl.yml @@ -27,7 +27,7 @@ jobs: with: name: pisugar-web path: | - electron/dist + pisugar-webui/dist # Rust cache - uses: Swatinem/rust-cache@v1 diff --git a/.github/workflows/build-other.yml b/.github/workflows/build-other.yml index abfeffe..4fcc70c 100644 --- a/.github/workflows/build-other.yml +++ b/.github/workflows/build-other.yml @@ -23,8 +23,8 @@ jobs: - name: Move files run: | set -x - mkdir -p electron/dist - mv -f download/pisugar-web/* electron/dist/ + mkdir -p pisugar-webui/dist + mv -f download/pisugar-web/* pisugar-webui/dist/ rm -rf download/pisugar-web mkdir -p target for i in $(ls download); do diff --git a/scripts/aur/build-aur.sh b/scripts/aur/build-aur.sh index 5c364fe..1749432 100755 --- a/scripts/aur/build-aur.sh +++ b/scripts/aur/build-aur.sh @@ -68,7 +68,7 @@ for i in arm armhf aarch64 x86_64; do cp -r "$ROOT_DIR/pisugar-server/.rpm/config.json" $i/ cp -r "$ROOT_DIR/pisugar-server/.rpm/pisugar-server.default" $i/ cp -r "$ROOT_DIR/pisugar-server/.rpm/pisugar-server.service" $i/ - cp -r "$ROOT_DIR/electron/dist/web" $i/ + cp -r "$ROOT_DIR/pisugar-webui/dist/" $i/web/ cp -r "$ROOT_DIR/pisugar-poweroff/.rpm/pisugar-poweroff.default" $i/ cp -r "$ROOT_DIR/pisugar-poweroff/.rpm/pisugar-poweroff.service" $i/ done