diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76350ca..3bfe4c7 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,6 +95,7 @@ jobs: CGO_ENABLED: 1 REPO_PASETO.PUBLIC_KEY: 408c5155a389aeabf1c1b0da73ff5a3079b6aa6628e4c661b1e1ce412181cc8a REPO_PASETO.PRIVATE_KEY: a5f7409588f6b72d443db0d432f37f1214a5ec88cb55a70e24b90194ed549465408c5155a389aeabf1c1b0da73ff5a3079b6aa6628e4c661b1e1ce412181cc8a + REPO_FEATURE_FLAGS.ALLOW_MULTI_TARGET_UPLOAD: "true" - name: Codecov uses: codecov/codecov-action@v1 \ No newline at end of file diff --git a/gql/resolver_versions.go b/gql/resolver_versions.go index 2abda30..d2f5a08 100644 --- a/gql/resolver_versions.go +++ b/gql/resolver_versions.go @@ -4,8 +4,6 @@ import ( "bytes" "context" "fmt" - "github.com/satisfactorymodding/smr-api/generated/conv" - "github.com/satisfactorymodding/smr-api/generated/ent" "io" "log/slog" "runtime/debug" @@ -20,6 +18,8 @@ import ( "github.com/satisfactorymodding/smr-api/db" "github.com/satisfactorymodding/smr-api/db/postgres" "github.com/satisfactorymodding/smr-api/generated" + "github.com/satisfactorymodding/smr-api/generated/conv" + "github.com/satisfactorymodding/smr-api/generated/ent" "github.com/satisfactorymodding/smr-api/integrations" "github.com/satisfactorymodding/smr-api/models" "github.com/satisfactorymodding/smr-api/redis" diff --git a/gql/versions.go b/gql/versions.go index 15ba473..71a5fb6 100644 --- a/gql/versions.go +++ b/gql/versions.go @@ -4,13 +4,13 @@ import ( "context" "encoding/json" "fmt" - "github.com/spf13/viper" "io" "log/slog" "time" "github.com/Vilsol/slox" "github.com/pkg/errors" + "github.com/spf13/viper" "github.com/satisfactorymodding/smr-api/db" "github.com/satisfactorymodding/smr-api/db/postgres" diff --git a/tests/utils.go b/tests/utils.go index cd21264..4e29463 100644 --- a/tests/utils.go +++ b/tests/utils.go @@ -2,11 +2,10 @@ package tests import ( "context" - "github.com/Vilsol/slox" - "github.com/machinebox/graphql" - "github.com/satisfactorymodding/smr-api/validation" "log/slog" "sync" + "github.com/Vilsol/slox" + "github.com/machinebox/graphql" smr "github.com/satisfactorymodding/smr-api/api" "github.com/satisfactorymodding/smr-api/auth" @@ -14,6 +13,7 @@ import ( "github.com/satisfactorymodding/smr-api/db/postgres" "github.com/satisfactorymodding/smr-api/redis" "github.com/satisfactorymodding/smr-api/util" + "github.com/satisfactorymodding/smr-api/validation" ) func setup() (context.Context, *graphql.Client, func()) { diff --git a/tests/version_test.go b/tests/version_test.go index 1139985..855f145 100644 --- a/tests/version_test.go +++ b/tests/version_test.go @@ -4,8 +4,6 @@ import ( "bytes" "encoding/json" "errors" - "github.com/satisfactorymodding/smr-api/generated" - "github.com/spf13/viper" "io" "math" "mime/multipart" @@ -19,10 +17,12 @@ import ( "time" "github.com/MarvinJWendt/testza" + "github.com/spf13/viper" "github.com/satisfactorymodding/smr-api/config" "github.com/satisfactorymodding/smr-api/db" "github.com/satisfactorymodding/smr-api/db/postgres" + "github.com/satisfactorymodding/smr-api/generated" "github.com/satisfactorymodding/smr-api/migrations" ) @@ -61,7 +61,7 @@ func TestVersions(t *testing.T) { defer response.Body.Close() - file, err := os.OpenFile(modPath, os.O_CREATE|os.O_WRONLY, 0644) + file, err := os.OpenFile(modPath, os.O_CREATE|os.O_WRONLY, 0o644) testza.AssertNoError(t, err) _, err = io.Copy(file, response.Body) diff --git a/validation/validation.go b/validation/validation.go index 356d964..90638d6 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -8,7 +8,6 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/davecgh/go-spew/spew" "io" "log/slog" "path" @@ -20,6 +19,7 @@ import ( "github.com/Masterminds/semver/v3" "github.com/Vilsol/slox" + "github.com/davecgh/go-spew/spew" "github.com/pkg/errors" "github.com/spf13/viper" "github.com/xeipuuv/gojsonschema"