Skip to content

Commit df6b714

Browse files
authored
Merge pull request #12 from katabole/up-vite-package-version
Up olivere/vite to v0.1.0, a true release
2 parents c2e8d20 + 051c86b commit df6b714

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ jobs:
4545
run: go fmt ./...
4646

4747
- name: Run tests
48-
run: go test -v ./...
48+
# NOTE(dk): -p 1 ensures we don't run the package tests concurrently. They can interfere with each other because
49+
# they share a test database. To be fixed by https://github.com/katabole/kbsql/issues/2
50+
run: go test -v -p 1 ./...

Taskfile.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ tasks:
4848
sources:
4949
- "**/*.go"
5050
cmds:
51-
- go test ./...
51+
# NOTE(dk): -p 1 ensures we don't run the package tests concurrently. They can interfere with each other because
52+
# they share a test database. To be fixed by https://github.com/katabole/kbsql/issues/2
53+
- go test -p 1 ./...
5254

5355
# Database tasks
5456
# Note that most of the configuration of these comes from environment variables, loaded with dotenv above

actions/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func NewApp(conf Config) (*App, error) {
6868
// Set up oauth, which is configured globally here and applied in routes.go
6969
gothic.Store = sessionStore
7070
goth.UseProviders(
71-
google.New(conf.GoogleOAuthKey, conf.GoogleOAuthSecret, fmt.Sprintf(conf.SiteURL+"/auth/google/callback")),
71+
google.New(conf.GoogleOAuthKey, conf.GoogleOAuthSecret, conf.SiteURL+"/auth/google/callback"),
7272
)
7373

7474
// Define our router middleware (logging, etc.), then define routes

go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/katabole/kbexample
22

3-
go 1.22.3
3+
go 1.24
4+
5+
toolchain go1.24.1
46

57
require (
68
github.com/elnormous/contenttype v1.0.4
@@ -17,7 +19,7 @@ require (
1719
github.com/kelseyhightower/envconfig v1.4.0
1820
github.com/markbates/goth v1.54.1
1921
github.com/monoculum/formam v3.5.5+incompatible
20-
github.com/olivere/vite v0.0.0-20241125063354-5c2fc1f1ddc2
22+
github.com/olivere/vite v0.1.0
2123
github.com/stretchr/testify v1.9.0
2224
github.com/unrolled/render v1.6.1
2325
github.com/unrolled/secure v1.14.0

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJE
121121
github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
122122
github.com/olivere/vite v0.0.0-20241125063354-5c2fc1f1ddc2 h1:yrFRHF77HTyASeJG/11+Zflj7Z5OVT+oIkeUc/EIwpI=
123123
github.com/olivere/vite v0.0.0-20241125063354-5c2fc1f1ddc2/go.mod h1:GcOsJRAsACfTzrwnVKPHHQb2IpqJo2o7OEGht882nuA=
124+
github.com/olivere/vite v0.0.0-20250319133730-12afb7a79b33 h1:1WeMPwfLEkOwsxYtGp70GJH7WczV85SRWHLSxInzYfc=
125+
github.com/olivere/vite v0.0.0-20250319133730-12afb7a79b33/go.mod h1:GcOsJRAsACfTzrwnVKPHHQb2IpqJo2o7OEGht882nuA=
126+
github.com/olivere/vite v0.1.0 h1:Wi5zTtS3BbnOrfG+oRT7KZOI9lp48gRv59VptSBmPO4=
127+
github.com/olivere/vite v0.1.0/go.mod h1:ef1SWmGSWAYJxSuY2Bu90YLQ7hUBxYmejIVuFGsIIe8=
124128
github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
125129
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
126130
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

0 commit comments

Comments
 (0)