From f1c1dadb6daa359a6ca4f7d2e8ab8d854d04719b Mon Sep 17 00:00:00 2001 From: CMGS Date: Thu, 23 Jul 2026 12:17:15 +0800 Subject: [PATCH 1/2] ci: bump pinned actions to current majors and go to 1.26.5 The pinned action versions had drifted apart across the org; this pins each to the major that is current today. go.mod follows the fleet to 1.26.5, which CI picks up through go-version-file. --- .github/workflows/build-macos-image.yml | 6 +++--- .github/workflows/build.yml | 6 +++--- .github/workflows/goreleaser.yml | 4 ++-- .github/workflows/lint.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- go.mod | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-macos-image.yml b/.github/workflows/build-macos-image.yml index 31f5130..16e82ba 100644 --- a/.github/workflows/build-macos-image.yml +++ b/.github/workflows/build-macos-image.yml @@ -36,7 +36,7 @@ jobs: STAGE: ${{ github.event.inputs.stage }} DISK_SIZE: ${{ github.event.inputs.disk_size }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v7 - name: Resolve macOS target (shortname + ghcr repo/tag + qcow2 name) run: | @@ -73,7 +73,7 @@ jobs: - name: Log in to ghcr if: ${{ github.event.inputs.stage != 'boot' }} - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} @@ -92,7 +92,7 @@ jobs: - name: Upload artifacts (screenshots / logs) if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: macos-build-${{ github.event.inputs.macos }}-${{ github.event.inputs.stage }} path: work/qemu-build/artifacts/ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02d50c5..f5c6ce6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout cocoon-macos - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version-file: 'go.mod' @@ -31,7 +31,7 @@ jobs: run: go build -o cocoon-macos . - name: Upload binary - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: cocoon-macos-linux-amd64 path: cocoon-macos diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index ba2d30c..adb64f0 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v7 with: fetch-depth: 0 @@ -21,7 +21,7 @@ jobs: run: echo "VERSION=$(git describe --tags --always)" >> $GITHUB_ENV - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version-file: 'go.mod' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 61d3200..bc663d9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,15 +16,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout cocoon-macos - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version-file: 'go.mod' - name: golangci-lint - uses: golangci/golangci-lint-action@v8 + uses: golangci/golangci-lint-action@v9 with: version: v2.9.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4d17c16..4aeb8e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout cocoon-macos - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version-file: 'go.mod' @@ -34,7 +34,7 @@ jobs: - name: Upload coverage artifact continue-on-error: true - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: coverage path: coverage.out diff --git a/go.mod b/go.mod index db83414..507f805 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cocoonstack/cocoon-macos -go 1.26.4 +go 1.26.5 require ( github.com/cocoonstack/cocoon v0.5.3 From d9dab600b3e21fb48cec2dc5ce6fd596a57ae41e Mon Sep 17 00:00:00 2001 From: CMGS Date: Thu, 23 Jul 2026 12:38:44 +0800 Subject: [PATCH 2/2] build: pin golangci-lint to v2.12.2 and install it via go install The upstream install.sh picks the .sbom.json checksum on v2.12.x releases and fails verification; go install resolves through the module checksum database instead, and drops the dependency on a script fetched from a moving branch. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7a4a049..4ab7fa4 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ $(LOCALBIN): mkdir -p $(LOCALBIN) ## Tool versions -GOLANGCILINT_VERSION ?= v2.9.0 +GOLANGCILINT_VERSION ?= v2.12.2 GOLANGCILINT_ROOT := $(LOCALBIN)/golangci-lint-$(GOLANGCILINT_VERSION) GOLANGCILINT := $(GOLANGCILINT_ROOT)/golangci-lint @@ -29,7 +29,7 @@ GOIMPORTS := $(LOCALBIN)/goimports .PHONY: golangci-lint golangci-lint: $(GOLANGCILINT) $(GOLANGCILINT): - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOLANGCILINT_ROOT) $(GOLANGCILINT_VERSION) + GOBIN=$(GOLANGCILINT_ROOT) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCILINT_VERSION) .PHONY: gofumpt gofumpt: $(GOFMT)