extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2024-11-25 01:33:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into test

Browse Source
This commit is contained in:
David Dworken 2024-09-03 21:46:15 -07:00
commit ec48356441
No known key found for this signature in database
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -41,12 +41,12 @@ build-api: ## [ddworken only] Build the API for api.hishtory.dev
deploy-static: ## [ddworken only] Build and deploy the server for hishtory.dev
deploy-static: build-static
ssh server "docker push gcr.io/dworken-k8s/hishtory-static"
ssh monoserver "cd ~/infra/ && docker compose pull hishtory-static && docker compose rm -svf hishtory-static && docker compose up -d hishtory-static"
ssh monoserver "cd ~/code/infra/ && docker compose pull hishtory-static && docker compose rm -svf hishtory-static && docker compose up -d hishtory-static"
deploy-api: ## [ddworken only] Build and deploy the API server for api.hishtory.dev
deploy-api: build-api
docker push gcr.io/dworken-k8s/hishtory-api
ssh monoserver "cd ~/infra/ && docker compose pull hishtory-api && docker compose up -d --no-deps hishtory-api"
ssh monoserver "cd ~/code/infra/ && docker compose pull hishtory-api && docker compose up -d --no-deps hishtory-api"
deploy: ## [ddworken only] Build and deploy all backend services
deploy: release deploy-static deploy-api

2
VERSION
View File

@ -1 +1 @@
310
311

2
backend/server/internal/database/db.go
View File

@ -10,7 +10,7 @@ import (
"github.com/ddworken/hishtory/shared"
"github.com/jackc/pgx/v4/stdlib"
"github.com/jackc/pgx/v5/stdlib"
_ "github.com/lib/pq"
"github.com/samber/lo"
sqltrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/database/sql"

3
go.mod
View File

@ -13,7 +13,6 @@ require (
github.com/go-test/deep v1.1.1
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/jackc/pgx/v4 v4.18.2
github.com/lib/pq v1.10.9
github.com/mattn/go-runewidth v0.0.16
github.com/muesli/termenv v0.15.2
@ -29,7 +28,7 @@ require (
golang.org/x/term v0.23.0
gopkg.in/DataDog/dd-trace-go.v1 v1.67.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gorm.io/driver/postgres v1.4.6
gorm.io/driver/postgres v1.5.9
gorm.io/driver/sqlite v1.5.6
gorm.io/gorm v1.25.11
gotest.tools/gotestsum v1.11.0

2
go.sum
View File

@ -1976,6 +1976,8 @@ gorm.io/driver/postgres v1.3.1 h1:Pyv+gg1Gq1IgsLYytj/S2k7ebII3CzEdpqQkPOdH24g=
gorm.io/driver/postgres v1.3.1/go.mod h1:WwvWOuR9unCLpGWCL6Y3JOeBWvbKi6JLhayiVclSZZU=
gorm.io/driver/postgres v1.4.6 h1:1FPESNXqIKG5JmraaH2bfCVlMQ7paLoCreFxDtqzwdc=
gorm.io/driver/postgres v1.4.6/go.mod h1:UJChCNLFKeBqQRE+HrkFUbKbq9idPXmTOk2u4Wok8S4=
gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8=
gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
gorm.io/driver/sqlite v1.3.6 h1:Fi8xNYCUplOqWiPa3/GuCeowRNBRGTf62DEmhMDHeQQ=
gorm.io/driver/sqlite v1.3.6/go.mod h1:Sg1/pvnKtbQ7jLXxfZa+jSHvoX8hoZA8cn4xllOMTgE=
gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE=