diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml index 89398c5..ad966d8 100644 --- a/.github/workflows/ci-go.yml +++ b/.github/workflows/ci-go.yml @@ -40,9 +40,3 @@ jobs: - name: check format run: go fmt ./... && git add --intent-to-add . && git diff --exit-code - run: go vet ./... - # Because of default in vscode extension - - uses: dominikh/staticcheck-action@v1.3.0 - with: - # Keep after `setup-go`, to use same go version - install-go: false - version: '2023.1.6' # selfup { "regex": "\\d{4}[^']+", "script": "staticcheck --version | cut -d ' ' -f 2" } diff --git a/Taskfile.yml b/Taskfile.yml index 0fe7086..5be11da 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -45,7 +45,6 @@ tasks: - goreleaser check - typos . .github .vscode - nixpkgs-fmt --check ./*.nix - - staticcheck ./... deps: cmds: - nix --version @@ -54,4 +53,3 @@ tasks: - dprint --version - goreleaser --version - typos --version - - staticcheck --version diff --git a/flake.nix b/flake.nix index 213a11c..9fef7db 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ # https://github.com/NixOS/nix/issues/730#issuecomment-162323824 bashInteractive - go_1_21 + go_1_22 nil nixpkgs-fmt dprint @@ -33,17 +33,18 @@ go-task goreleaser typos - go-tools ]; }; - packages.selfup = pkgs.buildGo121Module { + packages.selfup = pkgs.buildGo122Module { pname = "selfup"; version = updaterVersion; src = pkgs.lib.cleanSource self; - # When updating go.mod or go.sum, update this sha together - vendorSha256 = "sha256-ot3JjQ49kLVG+l1EyLaxonDfgxTyFTmli3B8YDIjhyY="; + # When updating go.mod or go.sum, update this sha together as following + # vendorHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + # `pkgs.lib.fakeSha256` returns invalid string in thesedays... :<; + vendorHash = "sha256-ot3JjQ49kLVG+l1EyLaxonDfgxTyFTmli3B8YDIjhyY="; }; packages.default = packages.selfup; diff --git a/go.mod b/go.mod index 5cb15d5..1987243 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/kachick/selfup -go 1.21 - -toolchain go1.21.1 +go 1.22.0 require ( github.com/huandu/xstrings v1.4.0