mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 12:24:38 +03:00
Support Go 1.18: Upgrade gqlgen to v0.17.2 (#2443)
* Upgrade gqlgen to v0.17.2 This enables builds on Go 1.18. github.com/vektah/gqlparser is upgraded to the newest version too. Getting this to work is a bit of a hazzle. I had to first remove vendoring from the repository, perform the upgrade and then re-introduce the vendor directory. I think gqlgens analysis went wrong for some reason on the upgrade. It would seem a clean-room installation fixed it. * Bump project to 1.18 * Update all packages, address gqlgenc breaking changes * Let `go mod tidy` handle the go.mod file * Upgrade linter to 1.45.2 * Introduce v1.45.2 of the linter The linter now correctly warns on `strings.Title` because it isn't unicode-aware. Fix this by using the suggested fix from x/text/cases to produce unicode-aware strings. The mapping isn't entirely 1-1 as this new approach has a larger iface: it spans all of unicode rather than just ASCII. It coincides for ASCII however, so things should be largely the same. * Ready ourselves for errchkjson and contextcheck. * Revert dockerfile golang version changes for now Co-authored-by: Kermie <kermie@isinthe.house> Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
8
vendor/github.com/Yamashou/gqlgenc/clientgen/query_source.go
generated
vendored
8
vendor/github.com/Yamashou/gqlgenc/clientgen/query_source.go
generated
vendored
@@ -23,6 +23,7 @@ SOFTWARE.
|
||||
package clientgen
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -31,7 +32,6 @@ import (
|
||||
|
||||
"github.com/99designs/gqlgen/codegen/config"
|
||||
"github.com/vektah/gqlparser/v2/ast"
|
||||
"golang.org/x/xerrors"
|
||||
)
|
||||
|
||||
var path2regex = strings.NewReplacer(
|
||||
@@ -71,12 +71,12 @@ func LoadQuerySources(queryFileNames []string) ([]*ast.Source, error) {
|
||||
|
||||
return nil
|
||||
}); err != nil {
|
||||
return nil, xerrors.Errorf("failed to walk schema at root: %w", pathParts[0])
|
||||
return nil, fmt.Errorf("failed to walk schema at root %s: %w", pathParts[0], err)
|
||||
}
|
||||
} else {
|
||||
matches, err = filepath.Glob(f)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("failed to glob schema filename %v: %w", f, err)
|
||||
return nil, fmt.Errorf("failed to glob schema filename %v: %w", f, err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ func LoadQuerySources(queryFileNames []string) ([]*ast.Source, error) {
|
||||
var schemaRaw []byte
|
||||
schemaRaw, err = ioutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("unable to open schema: %w", err)
|
||||
return nil, fmt.Errorf("unable to open schema: %w", err)
|
||||
}
|
||||
|
||||
querySources = append(querySources, &ast.Source{Name: filename, Input: string(schemaRaw)})
|
||||
|
||||
Reference in New Issue
Block a user