diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index dbfee321..1038afbc 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -28,47 +28,6 @@ env: MINIO_ROOT_PASSWORD: minioadmin jobs: - build-frontend: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Extract rust toolchain - id: toolchain - run: | - echo "channel=$(grep channel rust-toolchain.toml | awk -F' = ' '{printf $2}' | tr -d '\"')" >> "$GITHUB_OUTPUT" - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ steps.toolchain.outputs.channel }} - - - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: "npm" - cache-dependency-path: ${{ github.workspace }}/frontend/package-lock.json - - name: Build tailwindcss - working-directory: ${{ github.workspace }}/frontend - run: | - npm ci - npm run build - - - name: Install dioxus-cli - uses: taiki-e/cache-cargo-install-action@v2 - with: - tool: dioxus-cli - locked: false - - name: Build frontend - env: - RUST_LOG: info - run: | - dx build --verbose --profile ${{ (github.event_name == 'release' || github.event_name == 'workflow_dispatch') && 'release' || 'dev' }} - - - name: Upload build artifact - uses: actions/upload-artifact@v4 - with: - name: frontend - path: ${{ github.workspace }}/frontend/dist/ - retention-days: 1 - build-linux: strategy: fail-fast: false @@ -200,7 +159,7 @@ jobs: build-docker: runs-on: ubuntu-latest - needs: [build-frontend, build-linux] + needs: [build-linux] if: ${{ vars.BUILD_DOCKER != '' }} steps: @@ -570,8 +529,7 @@ jobs: upload-release: runs-on: ubuntu-latest - needs: - [build-frontend, build-linux, build-freebsd, build-windows, build-macos] + needs: [build-linux, build-freebsd, build-windows, build-macos] if: ${{ github.event_name == 'release' }} permissions: contents: write diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile index b22ee3fc..e0ee6987 100644 --- a/ci/docker/Dockerfile +++ b/ci/docker/Dockerfile @@ -13,7 +13,6 @@ RUN update-ca-certificates FROM ${BASE_IMAGE} COPY --from=artifact /artifact/nghe /app/nghe -COPY --from=artifact /artifact/frontend/ /app/frontend/ COPY --from=artifact /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ ENV NGHE_SERVER__HOST="::" ENV NGHE_SERVER__FRONTEND_DIR="/app/frontend/"