From e205e84428021f986f31f456d8be627292230bae Mon Sep 17 00:00:00 2001 From: lone-cloud Date: Fri, 13 Feb 2026 17:57:23 -0800 Subject: [PATCH] fix ci --- .github/workflows/ci.yml | 26 ++++----------------- Dockerfile | 2 +- Makefile | 2 +- {vendor => signal-cli}/signal-cli-amd64.gz | Bin {vendor => signal-cli}/signal-cli-arm64.gz | Bin 5 files changed, 6 insertions(+), 24 deletions(-) rename {vendor => signal-cli}/signal-cli-amd64.gz (100%) rename {vendor => signal-cli}/signal-cli-arm64.gz (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99a28f1..d432bc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,28 +25,10 @@ jobs: restore-keys: | ${{ runner.os }}-go- - - name: Download dependencies - run: go mod download - - - name: Run go vet - run: go vet ./... - - - name: Run gofmt + - name: Install tools run: | - if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then - echo "Code is not formatted. Run 'make fmt'" - gofmt -s -l . - exit 1 - fi - - - name: Install golangci-lint - uses: golangci/golangci-lint-action@v9 - with: - version: v2.8.0 - args: --timeout=5m - - - name: Check frontend - run: npx @biomejs/biome@latest check . + go install golang.org/x/tools/cmd/goimports@latest + curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.8.0 - name: Build - run: go build -v . + run: make all diff --git a/Dockerfile b/Dockerfile index 86ea865..b70a52c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM debian:trixie-slim ARG TARGETARCH -COPY vendor/signal-cli-${TARGETARCH}.gz /tmp/signal-cli.gz +COPY signal-cli/signal-cli-${TARGETARCH}.gz /tmp/signal-cli.gz RUN apt-get update && \ apt-get install -y --no-install-recommends wget && \ diff --git a/Makefile b/Makefile index b18a3a1..a5099e1 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ install-tools: aarch64) SIGNAL_ARCH=arm64 ;; \ *) echo "Unsupported architecture: $$ARCH"; exit 1 ;; \ esac; \ - gunzip -c vendor/signal-cli-$${SIGNAL_ARCH}.gz > /tmp/signal-cli && \ + gunzip -c signal-cli/signal-cli-$${SIGNAL_ARCH}.gz > /tmp/signal-cli && \ sudo mv /tmp/signal-cli /usr/local/bin/signal-cli && \ sudo chmod +x /usr/local/bin/signal-cli && \ signal-cli --version && \ diff --git a/vendor/signal-cli-amd64.gz b/signal-cli/signal-cli-amd64.gz similarity index 100% rename from vendor/signal-cli-amd64.gz rename to signal-cli/signal-cli-amd64.gz diff --git a/vendor/signal-cli-arm64.gz b/signal-cli/signal-cli-arm64.gz similarity index 100% rename from vendor/signal-cli-arm64.gz rename to signal-cli/signal-cli-arm64.gz