From cbc5f77236c2c6409ad6177dc60060ad1757c0de Mon Sep 17 00:00:00 2001 From: estrella Date: Mon, 12 Jun 2023 22:30:54 +0800 Subject: [PATCH] fix: ci problem --- .github/workflows/build.yml | 8 ++++---- Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49d78339..84b81232 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,8 +26,8 @@ jobs: build-webui: if: > - ${{ github.event_name == 'pull_request' }} || - ${{ github.event_name == 'push' && github.ref_type == 'tag' && (contains(github.ref, 'alpha') || contains(github.ref, 'beta')) }} + ((github.event_name == 'pull_request') || + (github.event_name == 'push' && github.ref_type == 'tag' && (contains(github.ref, 'alpha') || contains(github.ref, 'beta'))) runs-on: ubuntu-latest needs: [test] steps: @@ -144,8 +144,8 @@ jobs: release: if: > - ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true }} || - ${{ github.event_name == 'push' && contains(github.ref, 'tags') }} + ((github.event_name == 'pull_request' && github.event.pull_request.merged == true) || + (github.event_name == 'push' && contains(github.ref, 'tags'))) runs-on: ubuntu-latest needs: [ build-docker ] steps: diff --git a/Dockerfile b/Dockerfile index 9e0f62d7..c2e996b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,14 +36,16 @@ RUN apk add --no-cache \ sed -i '/bcrypt/d' requirements.txt && \ pip install --no-cache-dir -r requirements.txt && \ # Unzip WebUI \ - unzip dist.zip -d /app/templates && \ + unzip dist.zip && \ + mv dist templates && \ # Add user addgroup -S ab -g 911 && \ adduser -S ab -G ab -h /ab -s /bin/bash -u 911 && \ # Clear rm -rf \ /root/.cache \ - /tmp/* + /tmp/* \ + /app/dist.zip COPY --chmod=755 backend/src/. . COPY --chmod=755 backend/src/docker /