bump go to 1.22

nothub · Feb 10, 2024 · e662c3a · e662c3a
1 parent cb5f7c2
commit e662c3a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -18,8 +18,7 @@ clean:
 
 .PHONY: check
 check:
-	go vet
-	go test -v -parallel $(shell grep -c -E "^processor.*[0-9]+" "/proc/cpuinfo") $(MOD_NAME)/...
+	./tools/check.sh
 
 .PHONY: dl-stats
 dl-stats:

diff --git a/cmd/server.go b/cmd/server.go
@@ -35,7 +35,6 @@ func init() {
 			}
 			minecraftVersion = latestMinecraftVersion
 		}
-		minecraftVersion = minecraftVersion
 	})
 }
 

diff --git a/go.mod b/go.mod
@@ -1,12 +1,12 @@
 module hub.lol/mrpack-install
 
-go 1.21
+go 1.22
 
 require (
 	github.com/google/uuid v1.6.0
 	github.com/nothub/hashutils v0.4.0
 	github.com/spf13/cobra v1.8.0
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
+	golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -12,5 +12,7 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
+golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
+golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/tools/build.sh b/tools/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/e92b6015881907e698782c77641aa49298330223.tar.gz
-#! nix-shell -p go_1_21 git upx
+#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/f8e2ebd66d097614d51a56a755450d4ae1632df1.tar.gz
+#! nix-shell -p go_1_22 git upx
 #! nix-shell -i sh --pure
 # shellcheck shell=sh
 

diff --git a/tools/check.sh b/tools/check.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/f8e2ebd66d097614d51a56a755450d4ae1632df1.tar.gz
+#! nix-shell -p go_1_22
+#! nix-shell -i sh --pure
+# shellcheck shell=sh
+
+set -eu
+cd "$(dirname "$(realpath "$0")")/.."
+set -x
+
+go vet ./...
+go test -v -parallel "$(grep -c -E "^processor.*[0-9]+" "/proc/cpuinfo")" ./...
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ func init() { @@
     			}
     			minecraftVersion = latestMinecraftVersion
     		}
-    		minecraftVersion = minecraftVersion
     	})
     }
@@ Expand Down @@