From abc4e63efbfc086f284a016926bae5b4d5d23af6 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki <7413593+a8m@users.noreply.github.com> Date: Wed, 3 Jun 2020 15:33:56 +0300 Subject: [PATCH] ci: change postgres12 listen port (#521) --- .circleci/config.yml | 4 ++-- entc/integration/compose/docker-compose.yaml | 2 +- entc/integration/customid/customid_test.go | 2 +- entc/integration/integration_test.go | 2 +- entc/integration/json/json_test.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6862636da..4910c4471 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,7 +87,7 @@ jobs: environment: POSTGRES_DB: test POSTGRES_PASSWORD: pass - command: -p 5432 + command: -p 5433 - image: entgo/gremlin-server entrypoint: /opt/gremlin-server/bin/gremlin-server.sh command: conf/gremlin-server.yaml @@ -102,7 +102,7 @@ jobs: -wait tcp://localhost:3308 -wait tcp://localhost:5430 -wait tcp://localhost:5431 - -wait tcp://localhost:5432 + -wait tcp://localhost:5433 -wait tcp://localhost:8182 - *mktestdir - getmods diff --git a/entc/integration/compose/docker-compose.yaml b/entc/integration/compose/docker-compose.yaml index ae53743a2..e4ffb4135 100644 --- a/entc/integration/compose/docker-compose.yaml +++ b/entc/integration/compose/docker-compose.yaml @@ -64,7 +64,7 @@ services: healthcheck: test: pg_isready -U postgres ports: - - 5432:5432 + - 5433:5432 gremlin: image: entgo/gremlin-server diff --git a/entc/integration/customid/customid_test.go b/entc/integration/customid/customid_test.go index ef9f6c144..accee6408 100644 --- a/entc/integration/customid/customid_test.go +++ b/entc/integration/customid/customid_test.go @@ -50,7 +50,7 @@ func TestMySQL(t *testing.T) { } func TestPostgres(t *testing.T) { - for version, port := range map[string]int{"10": 5430, "11": 5431, "12": 5432} { + for version, port := range map[string]int{"10": 5430, "11": 5431, "12": 5433} { t.Run(version, func(t *testing.T) { dsn := fmt.Sprintf("host=localhost port=%d user=postgres password=pass sslmode=disable", port) db, err := sql.Open(dialect.Postgres, dsn) diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go index 6552e10fa..4c338f5eb 100644 --- a/entc/integration/integration_test.go +++ b/entc/integration/integration_test.go @@ -68,7 +68,7 @@ func TestMySQL(t *testing.T) { } func TestPostgres(t *testing.T) { - for version, port := range map[string]int{"10": 5430, "11": 5431, "12": 5432} { + for version, port := range map[string]int{"10": 5430, "11": 5431, "12": 5433} { t.Run(version, func(t *testing.T) { client := enttest.Open(t, dialect.Postgres, fmt.Sprintf("host=localhost port=%d user=postgres dbname=test password=pass sslmode=disable", port), opts) defer client.Close() diff --git a/entc/integration/json/json_test.go b/entc/integration/json/json_test.go index feafefdd0..fe2cd3edb 100644 --- a/entc/integration/json/json_test.go +++ b/entc/integration/json/json_test.go @@ -57,7 +57,7 @@ func TestMySQL(t *testing.T) { } func TestPostgres(t *testing.T) { - for version, port := range map[string]int{"10": 5430, "11": 5431, "12": 5432} { + for version, port := range map[string]int{"10": 5430, "11": 5431, "12": 5433} { t.Run(version, func(t *testing.T) { dsn := fmt.Sprintf("host=localhost port=%d user=postgres password=pass sslmode=disable", port) db, err := sql.Open(dialect.Postgres, dsn)