Merge pull request #796 from thedadams/go-1-23-0

thedadams · web-flow · commit 78b5c3d779b5 · 2024-08-14T16:00:19.000-04:00
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: "1.22"
+          go-version: "1.23"
       - name: Build
         if: matrix.os == 'ubuntu-22.04'
         run: make build
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -26,9 +26,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           cache: false
-          # This can't be upgraded until the issue with sys.daemon on Windows is resolved
-          # After the issue is resolved, this can be set to 1.22
-          go-version: "1.22.4"
+          go-version: "1.23"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,9 +20,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           cache: false
-          # This can't be upgraded until the issue with sys.daemon on Windows is resolved
-          # After the issue is resolved, this can be set to 1.22
-          go-version: "1.22.4"
+          go-version: "1.23"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: "1.22"
+          go-version: "1.23"
       - name: Validate
         if: matrix.os == 'ubuntu-22.04'
         run: make validate
diff --git a/.github/workflows/validate-docs.yaml b/.github/workflows/validate-docs.yaml
@@ -17,6 +17,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: "1.22"
+          go-version: "1.23"
       - run: make init-docs
       - run: make validate-docs
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ smoke: build
 smoke:
 	go test -v -tags='smoke' ./pkg/tests/smoke/...
 
-GOLANGCI_LINT_VERSION ?= v1.59.0
+GOLANGCI_LINT_VERSION ?= v1.60.1
 lint:
 	if ! command -v golangci-lint &> /dev/null; then \
   		echo "Could not find golangci-lint, installing version $(GOLANGCI_LINT_VERSION)."; \
diff --git a/go.mod b/go.mod
@@ -1,7 +1,6 @@
 module github.com/gptscript-ai/gptscript
 
-// This can't be upgraded until the issue with sys.daemon on Windows is resolved
-go 1.22.4
+go 1.23.0
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
diff --git a/pkg/loader/openapi.go b/pkg/loader/openapi.go
@@ -86,7 +86,7 @@ func getOpenAPITools(t *openapi3.T, defaultHost, source, targetToolName string)
 		pathObj := pathMap[pathString]
 		// Handle path-level server override, if one exists
 		pathServer := defaultServer
-		if pathObj.Servers != nil && len(pathObj.Servers) > 0 {
+		if len(pathObj.Servers) > 0 {
 			pathServer, err = parseServer(pathObj.Servers[0])
 			if err != nil {
 				return nil, err
diff --git a/pkg/openapi/getschema.go b/pkg/openapi/getschema.go
@@ -83,7 +83,7 @@ func GetSchema(operationID, defaultHost string, t *openapi3.T) (string, Operatio
 	for path, pathItem := range t.Paths.Map() {
 		// Handle path-level server override, if one exists.
 		pathServer := defaultServer
-		if pathItem.Servers != nil && len(pathItem.Servers) > 0 {
+		if len(pathItem.Servers) > 0 {
 			pathServer, err = parseServer(pathItem.Servers[0])
 			if err != nil {
 				return "", OperationInfo{}, false, err
diff --git a/pkg/repos/runtimes/default.go b/pkg/repos/runtimes/default.go
@@ -26,7 +26,7 @@ var Runtimes = []repos.Runtime{
 		Default: true,
 	},
 	&golang.Runtime{
-		Version: "1.22.1",
+		Version: "1.23.0",
 	},
 }
 
diff --git a/pkg/repos/runtimes/golang/digests.txt b/pkg/repos/runtimes/golang/digests.txt
@@ -1,10 +1,10 @@
-3bc971772f4712fec0364f4bc3de06af22a00a12daab10b6f717fdcd13156cc0  go1.22.1.darwin-amd64.tar.gz
-943e4f9f038239f9911c44366f52ab9202f6ee13610322a668fe42406fb3deef  go1.22.1.darwin-amd64.pkg
-f6a9cec6b8a002fcc9c0ee24ec04d67f430a52abc3cfd613836986bcc00d8383  go1.22.1.darwin-arm64.tar.gz
-5f10b95e2678618f85ba9d87fbed506b3b87efc9d5a8cafda939055cb97949ba  go1.22.1.darwin-arm64.pkg
-8484df36d3d40139eaf0fe5e647b006435d826cc12f9ae72973bf7ec265e0ae4  go1.22.1.linux-386.tar.gz
-aab8e15785c997ae20f9c88422ee35d962c4562212bb0f879d052a35c8307c7f  go1.22.1.linux-amd64.tar.gz
-e56685a245b6a0c592fc4a55f0b7803af5b3f827aaa29feab1f40e491acf35b8  go1.22.1.linux-arm64.tar.gz
-8cb7a90e48c20daed39a6ac8b8a40760030ba5e93c12274c42191d868687c281  go1.22.1.linux-armv6l.tar.gz
-0c5ebb7eb39b7884ec99f92b425d4c03a96a72443562aafbf6e7d15c42a3108a  go1.22.1.windows-386.zip
-cf9c66a208a106402a527f5b956269ca506cfe535fc388e828d249ea88ed28ba  go1.22.1.windows-amd64.zip
+ffd070acf59f054e8691b838f274d540572db0bd09654af851e4e76ab88403dc  go1.23.0.darwin-amd64.tar.gz
+bc91d2573939a01731413fac0884c329606c1c168883692131ce772669caf27b  go1.23.0.darwin-amd64.pkg
+b770812aef17d7b2ea406588e2b97689e9557aac7e646fe76218b216e2c51406  go1.23.0.darwin-arm64.tar.gz
+d73ae741ed449ea842238f76f4b02935277eb867689f84ace0640965b2caf700  go1.23.0.darwin-arm64.pkg
+0e8a7340c2632e6fb5088d60f95b52be1f8303143e04cd34e9b2314fafc24edd  go1.23.0.linux-386.tar.gz
+905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3  go1.23.0.linux-amd64.tar.gz
+62788056693009bcf7020eedc778cdd1781941c6145eab7688bd087bce0f8659  go1.23.0.linux-arm64.tar.gz
+0efa1338e644d7f74064fa7f1016b5da7872b2df0070ea3b56e4fef63192e35b  go1.23.0.linux-armv6l.tar.gz
+09448fedec0cdf98ad12397222e0c8bfc835b1d0894c0015ced653534b8d7427  go1.23.0.windows-386.zip
+d4be481ef73079ee0ad46081d278923aa3fd78db1b3cf147172592f73e14c1ac  go1.23.0.windows-amd64.zip
diff --git a/pkg/repos/runtimes/golang/golang_test.go b/pkg/repos/runtimes/golang/golang_test.go
@@ -25,7 +25,7 @@ func TestRuntime(t *testing.T) {
 		os.RemoveAll("testdata/bin")
 	})
 	r := Runtime{
-		Version: "1.22.1",
+		Version: "1.23.0",
 	}
 
 	s, err := r.Setup(context.Background(), types.Tool{}, testCacheHome, "testdata", os.Environ())
diff --git a/pkg/repos/runtimes/golang/testdata/go.mod b/pkg/repos/runtimes/golang/testdata/go.mod
@@ -1,3 +1,3 @@
 module example.com
 
-go 1.22.1
+go 1.23.0
diff --git a/pkg/repos/runtimes/node/node.go b/pkg/repos/runtimes/node/node.go
@@ -136,7 +136,7 @@ func (r *Runtime) runNPM(ctx context.Context, tool types.Tool, toolSource, binDi
 		if tool.WorkingDir == "" {
 			return nil
 		}
-		if _, err := os.Stat(filepath.Join(tool.WorkingDir, packageJSON)); errors.Is(fs.ErrNotExist, err) {
+		if _, err := os.Stat(filepath.Join(tool.WorkingDir, packageJSON)); errors.Is(err, fs.ErrNotExist) {
 			return nil
 		} else if err != nil {
 			return err
diff --git a/pkg/sdkserver/routes.go b/pkg/sdkserver/routes.go
@@ -271,7 +271,7 @@ func (s *server) parse(w http.ResponseWriter, r *http.Request) {
 	} else {
 		content, loadErr := input.FromLocation(reqObject.File, reqObject.DisableCache)
 		if loadErr != nil {
-			logger.Errorf(loadErr.Error())
+			logger.Errorf("failed to load file: %v", loadErr)
 			writeError(logger, w, http.StatusInternalServerError, loadErr)
 			return
 		}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ var Runtimes = []repos.Runtime{`
`26`	`26`	`Default: true,`
`27`	`27`	`},`
`28`	`28`	`&golang.Runtime{`
`29`		`- Version: "1.22.1",`
	`29`	`+ Version: "1.23.0",`
`30`	`30`	`},`
`31`	`31`	`}`
`32`	`32`