diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 648eef7..a9194a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,4 +45,6 @@ jobs: run: go fmt ./... - name: Run tests - run: go test -v ./... + # NOTE(dk): -p 1 ensures we don't run the package tests concurrently. They can interfere with each other because + # they share a test database. To be fixed by https://github.com/katabole/kbsql/issues/2 + run: go test -v -p 1 ./... diff --git a/Taskfile.yml b/Taskfile.yml index 4db2d98..2d0a563 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -48,7 +48,9 @@ tasks: sources: - "**/*.go" cmds: - - go test ./... + # NOTE(dk): -p 1 ensures we don't run the package tests concurrently. They can interfere with each other because + # they share a test database. To be fixed by https://github.com/katabole/kbsql/issues/2 + - go test -p 1 ./... # Database tasks # Note that most of the configuration of these comes from environment variables, loaded with dotenv above diff --git a/actions/app.go b/actions/app.go index bafeac4..91e443c 100644 --- a/actions/app.go +++ b/actions/app.go @@ -68,7 +68,7 @@ func NewApp(conf Config) (*App, error) { // Set up oauth, which is configured globally here and applied in routes.go gothic.Store = sessionStore goth.UseProviders( - google.New(conf.GoogleOAuthKey, conf.GoogleOAuthSecret, fmt.Sprintf(conf.SiteURL+"/auth/google/callback")), + google.New(conf.GoogleOAuthKey, conf.GoogleOAuthSecret, conf.SiteURL+"/auth/google/callback"), ) // Define our router middleware (logging, etc.), then define routes diff --git a/go.mod b/go.mod index 99c34b4..fc3e06e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/katabole/kbexample -go 1.22.3 +go 1.24 + +toolchain go1.24.1 require ( github.com/elnormous/contenttype v1.0.4 @@ -17,7 +19,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/markbates/goth v1.54.1 github.com/monoculum/formam v3.5.5+incompatible - github.com/olivere/vite v0.0.0-20241125063354-5c2fc1f1ddc2 + github.com/olivere/vite v0.1.0 github.com/stretchr/testify v1.9.0 github.com/unrolled/render v1.6.1 github.com/unrolled/secure v1.14.0 diff --git a/go.sum b/go.sum index cfec4a6..06365e7 100644 --- a/go.sum +++ b/go.sum @@ -121,6 +121,10 @@ github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJE github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/olivere/vite v0.0.0-20241125063354-5c2fc1f1ddc2 h1:yrFRHF77HTyASeJG/11+Zflj7Z5OVT+oIkeUc/EIwpI= github.com/olivere/vite v0.0.0-20241125063354-5c2fc1f1ddc2/go.mod h1:GcOsJRAsACfTzrwnVKPHHQb2IpqJo2o7OEGht882nuA= +github.com/olivere/vite v0.0.0-20250319133730-12afb7a79b33 h1:1WeMPwfLEkOwsxYtGp70GJH7WczV85SRWHLSxInzYfc= +github.com/olivere/vite v0.0.0-20250319133730-12afb7a79b33/go.mod h1:GcOsJRAsACfTzrwnVKPHHQb2IpqJo2o7OEGht882nuA= +github.com/olivere/vite v0.1.0 h1:Wi5zTtS3BbnOrfG+oRT7KZOI9lp48gRv59VptSBmPO4= +github.com/olivere/vite v0.1.0/go.mod h1:ef1SWmGSWAYJxSuY2Bu90YLQ7hUBxYmejIVuFGsIIe8= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=