From 3fa6ac8675270e13ee5bf50aa23973ee74848dbf Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 2 Apr 2025 02:35:45 +0000 Subject: [PATCH 1/4] chore: update go to 1.24.1 --- .github/workflows/ci.yaml | 12 ++++++------ .github/workflows/release.yaml | 2 +- go.mod | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b292e89..dfca647 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: # Install Go! - uses: actions/setup-go@v3 with: - go-version: "~1.23" + go-version: "~1.24" # Check for Go linting errors! - name: Lint Go @@ -98,7 +98,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: "~1.23" + go-version: "~1.24" # Sadly the new "set output" syntax (of writing env vars to # $GITHUB_OUTPUT) does not work on both powershell and bash so we use the @@ -136,7 +136,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: "~1.23" + go-version: "~1.24" # Sadly the new "set output" syntax (of writing env vars to # $GITHUB_OUTPUT) does not work on both powershell and bash so we use the @@ -170,7 +170,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "~1.23" + go-version: "~1.24" - name: Go Cache Paths id: go-cache-paths @@ -223,7 +223,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: "~1.23" + go-version: "~1.24" - name: Go Cache Paths id: go-cache-paths @@ -262,7 +262,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: "~1.23" + go-version: "~1.24" - name: build image run: make -j build/image/envbox diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2735b78..3c77ce1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -57,7 +57,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: "~1.23" + go-version: "~1.24" - name: Go Cache Paths id: go-cache-paths diff --git a/go.mod b/go.mod index ab9efd6..4ce200b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/coder/envbox -go 1.23.3 +go 1.24.1 + // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here: // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374 From b0ae9a3e17bbc927b87eb1801abd0b51622d5f84 Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 2 Apr 2025 04:51:42 +0000 Subject: [PATCH 2/4] update golanglint-ci --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dfca647..078d698 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,7 +43,7 @@ jobs: - name: Lint Go uses: golangci/golangci-lint-action@v6.1.1 with: - version: v1.62.2 + version: v1.64.8 args: "--out-${NO_FUTURE}format colored-line-number" - name: Lint shell scripts From b312dc7a2bdf9fe474a32c7302fc796afedb298d Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 2 Apr 2025 05:46:37 +0000 Subject: [PATCH 3/4] skip cliflag --- .golangci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.golangci.yaml b/.golangci.yaml index e92087f..2ce5da3 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -202,6 +202,7 @@ run: concurrency: 4 skip-dirs: - node_modules + - cli/cliflag skip-files: - scripts/rules.go timeout: 5m From f6824c8c65572b326910d9c253d308a57d1afc9e Mon Sep 17 00:00:00 2001 From: Jon Ayers Date: Wed, 2 Apr 2025 07:13:52 +0000 Subject: [PATCH 4/4] rm invalid linter --- .golangci.yaml | 1 - sysboxutil/manager.go | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 2ce5da3..06f75af 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -219,7 +219,6 @@ linters: - errcheck - errname - errorlint - - exportloopref - forcetypeassert - gocritic - gocyclo diff --git a/sysboxutil/manager.go b/sysboxutil/manager.go index 61ea658..d3f9bef 100644 --- a/sysboxutil/manager.go +++ b/sysboxutil/manager.go @@ -5,8 +5,9 @@ import ( "os" "time" - "github.com/coder/envbox/xunix" "golang.org/x/xerrors" + + "github.com/coder/envbox/xunix" ) const ManagerSocketPath = "/run/sysbox/sysmgr.sock"