From e2bce260c62f48bade257bc1561a751eb0182afb Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 1 Sep 2024 14:35:19 -0700 Subject: [PATCH 1/3] Update deps to fix #241 (#243) --- backend/server/internal/database/db.go | 2 +- go.mod | 3 +-- go.sum | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/server/internal/database/db.go b/backend/server/internal/database/db.go index d33c623..e7c3a9e 100644 --- a/backend/server/internal/database/db.go +++ b/backend/server/internal/database/db.go @@ -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" diff --git a/go.mod b/go.mod index bcac89b..4b2882b 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 04ba866..2499c38 100644 --- a/go.sum +++ b/go.sum @@ -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= From 11d4fe03ffc67728017a730ef8a1ee5e1f386bff Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 1 Sep 2024 15:00:03 -0700 Subject: [PATCH 2/3] Release v0.311 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 54ea97e..b661fff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -310 +311 From 5cfcbe515101bec8317058be31d4f2055b4eedb2 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Tue, 3 Sep 2024 21:18:54 -0700 Subject: [PATCH 3/3] Update makefile deploy path --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 37e7c94..e910d58 100644 --- a/Makefile +++ b/Makefile @@ -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