Skip to content

Commit 2023438

Browse files
committed
add service.postgres-tls
1 parent 169b9d1 commit 2023438

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

.github/workflows/code-coverage.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,23 @@ jobs:
2121
runs-on: ubuntu-latest
2222
services:
2323
postgres:
24-
image: nimbustech/postgres-ssl:9.5
24+
image: postgres:10.8
2525
env:
2626
POSTGRES_USER: postgres
2727
POSTGRES_PASSWORD: postgres
2828
POSTGRES_DB: postgres
2929
ports:
3030
- 5432:5432
31+
# needed because the postgres container does not provide a healthcheck
32+
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
33+
postgres-tls:
34+
image: nimbustech/postgres-ssl:9.5
35+
env:
36+
POSTGRES_USER: postgres
37+
POSTGRES_PASSWORD: postgres
38+
POSTGRES_DB: postgres
39+
ports:
40+
- 5433:5432
3141
volumes:
3242
- tests/cert:/var/ssl
3343
# needed because the postgres container does not provide a healthcheck
@@ -52,7 +62,8 @@ jobs:
5262
version: '0.11.0'
5363
args: --out Xml --all --all-features
5464
env:
55-
TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres?sslmode=disable"
65+
TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres"
66+
TEST_TLS_URL: "postgresql://localhost:5433/postgres?user=postgres&password=postgres?sslmode=verify-ca"
5667
- name: Upload to codecov.io
5768
uses: codecov/codecov-action@v1.0.2
5869
with:

.github/workflows/stable-test.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,23 @@ jobs:
2929
- 1.40.0
3030
services:
3131
postgres:
32-
image: nimbustech/postgres-ssl:9.5
32+
image: postgres:10.8
3333
env:
3434
POSTGRES_USER: postgres
3535
POSTGRES_PASSWORD: postgres
3636
POSTGRES_DB: postgres
3737
ports:
3838
- 5432:5432
39+
# needed because the postgres container does not provide a healthcheck
40+
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
41+
postgres-tls:
42+
image: nimbustech/postgres-ssl:9.5
43+
env:
44+
POSTGRES_USER: postgres
45+
POSTGRES_PASSWORD: postgres
46+
POSTGRES_DB: postgres
47+
ports:
48+
- 5433:5432
3949
volumes:
4050
- tests/cert:/var/ssl
4151
# needed because the postgres container does not provide a healthcheck
@@ -61,4 +71,5 @@ jobs:
6171
command: test
6272
args: --all --all-features --no-fail-fast -- --nocapture
6373
env:
64-
TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres?sslmode=disable"
74+
TEST_URL: "postgresql://localhost/postgres?user=postgres&password=postgres"
75+
TEST_TLS_URL: "postgresql://localhost:5433/postgres?user=postgres&password=postgres?sslmode=verify-ca"

0 commit comments

Comments
 (0)