From 7e4a1dcb7dd3948f1b313ac4e1941a2852c2b26e Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 17 Apr 2025 16:12:07 +0100 Subject: [PATCH 1/2] fix(cli/server.go): switch to alternate maven repo for postgres binaries --- cli/server.go | 2 ++ scripts/embedded-pg/main.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cli/server.go b/cli/server.go index 5ea0f4ebbd687..bdae179b717aa 100644 --- a/cli/server.go +++ b/cli/server.go @@ -2160,6 +2160,8 @@ func startBuiltinPostgres(ctx context.Context, cfg config.Root, logger slog.Logg embeddedpostgres.DefaultConfig(). Version(embeddedpostgres.V13). BinariesPath(filepath.Join(cfg.PostgresPath(), "bin")). + // Default BinaryRepositoryURL repo1.maven.apache.org is flaky. + BinaryRepositoryURL("https://repo.maven.apache.org/maven2"). DataPath(filepath.Join(cfg.PostgresPath(), "data")). RuntimePath(filepath.Join(cfg.PostgresPath(), "runtime")). CachePath(cachePath). diff --git a/scripts/embedded-pg/main.go b/scripts/embedded-pg/main.go index 018ec6e68bb69..c71df6090904d 100644 --- a/scripts/embedded-pg/main.go +++ b/scripts/embedded-pg/main.go @@ -24,6 +24,8 @@ func main() { embeddedpostgres.DefaultConfig(). Version(embeddedpostgres.V16). BinariesPath(filepath.Join(postgresPath, "bin")). + // Default BinaryRepositoryURL repo1.maven.apache.org is flaky. + BinaryRepositoryURL("https://repo.maven.apache.org/maven2"). DataPath(filepath.Join(postgresPath, "data")). RuntimePath(filepath.Join(postgresPath, "runtime")). CachePath(filepath.Join(postgresPath, "cache")). From 1d406301ad411eb6c9f3002e47ce0c2e4ed48858 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 17 Apr 2025 16:18:15 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Danny Kopping --- cli/server.go | 2 +- scripts/embedded-pg/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/server.go b/cli/server.go index bdae179b717aa..39cfa52571595 100644 --- a/cli/server.go +++ b/cli/server.go @@ -2160,7 +2160,7 @@ func startBuiltinPostgres(ctx context.Context, cfg config.Root, logger slog.Logg embeddedpostgres.DefaultConfig(). Version(embeddedpostgres.V13). BinariesPath(filepath.Join(cfg.PostgresPath(), "bin")). - // Default BinaryRepositoryURL repo1.maven.apache.org is flaky. + // Default BinaryRepositoryURL repo1.maven.org is flaky. BinaryRepositoryURL("https://repo.maven.apache.org/maven2"). DataPath(filepath.Join(cfg.PostgresPath(), "data")). RuntimePath(filepath.Join(cfg.PostgresPath(), "runtime")). diff --git a/scripts/embedded-pg/main.go b/scripts/embedded-pg/main.go index c71df6090904d..aa6de1027f54d 100644 --- a/scripts/embedded-pg/main.go +++ b/scripts/embedded-pg/main.go @@ -24,7 +24,7 @@ func main() { embeddedpostgres.DefaultConfig(). Version(embeddedpostgres.V16). BinariesPath(filepath.Join(postgresPath, "bin")). - // Default BinaryRepositoryURL repo1.maven.apache.org is flaky. + // Default BinaryRepositoryURL repo1.maven.org is flaky. BinaryRepositoryURL("https://repo.maven.apache.org/maven2"). DataPath(filepath.Join(postgresPath, "data")). RuntimePath(filepath.Join(postgresPath, "runtime")).