From d83217504c7cc94d5b2d2b1f47aa8735f77e2300 Mon Sep 17 00:00:00 2001 From: xcaliber Date: Mon, 16 Feb 2026 14:15:46 +0000 Subject: [PATCH] Ci fixes unified build (#28) --- .gitea/workflows/ci.yaml | 1 + Dockerfile.unified | 4 +++- VERSION | 2 +- build.sh | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index f1b4d98..014dc45 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -225,6 +225,7 @@ jobs: - name: Push unified to Docker Hub if: steps.env.outputs.is_release == 'true' && secrets.DOCKERHUB_TOKEN != '' + continue-on-error: true run: | echo "${{ secrets.DOCKERHUB_TOKEN }}" | \ docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin diff --git a/Dockerfile.unified b/Dockerfile.unified index 7a23e62..055de20 100644 --- a/Dockerfile.unified +++ b/Dockerfile.unified @@ -14,9 +14,11 @@ FROM golang:1.22-bookworm AS backend WORKDIR /app COPY server/go.mod server/go.sum* ./ -RUN go mod download && go mod verify COPY server/ . + +RUN go mod download && go mod tidy && go mod verify + RUN CGO_ENABLED=0 go build -ldflags="-s -w" -o /bin/switchboard . # ── Stage 2: Frontend build ────────────────── diff --git a/VERSION b/VERSION index 8a9ecc2..8294c18 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.1 \ No newline at end of file +0.1.2 \ No newline at end of file diff --git a/build.sh b/build.sh index ffec7a2..9260637 100755 --- a/build.sh +++ b/build.sh @@ -18,6 +18,7 @@ mkdir -p "$OUTPUT_DIR" # Read source files CSS_CONTENT=$(cat "$SRC_DIR/css/styles.css") +JS_BACKEND=$(cat "$SRC_DIR/js/backend.js") JS_STORAGE=$(cat "$SRC_DIR/js/storage.js") JS_STATE=$(cat "$SRC_DIR/js/state.js") JS_API=$(cat "$SRC_DIR/js/api.js") @@ -58,6 +59,8 @@ HTMLEOF echo "$JS_STORAGE" >> "$OUTPUT_FILE" echo "" >> "$OUTPUT_FILE" +echo "$JS_BACKEND" >> "$OUTPUT_FILE" +echo "" >> "$OUTPUT_FILE" echo "$JS_STATE" >> "$OUTPUT_FILE" echo "" >> "$OUTPUT_FILE" echo "$JS_API" >> "$OUTPUT_FILE"