From cc08b58d4ee919e1efa1833c2c0ac03d30c38cbc Mon Sep 17 00:00:00 2001
From: Rust Saiargaliev <fly.amureki@gmail.com>
Date: Mon, 17 Oct 2022 13:39:35 +0300
Subject: [PATCH] Use official postgis docker image in CI (#355)
* Use official postgis docker image in CI
Drop unsupported GitHub action:
https://github.com/huaxk/postgis-action/releases
* Drop possibly not needed configuration
* Set up pg password
* Unify env var names
* Bring back extensions
* Revert "Unify env var names"
This reverts commit 007520acad04c01826b53a4fdb9b5e11090c781a.
* Update changelog
* One more drop
---
.github/workflows/tests.yml | 23 ++++++++++++++---------
CHANGELOG.md | 1 +
tox.ini | 1 +
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5f523d16..4d2294eb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,6 +11,19 @@ jobs:
name: Python ${{ matrix.python-version }}
runs-on: ubuntu-latest
+ services:
+ postgis:
+ image: postgis/postgis
+ env:
+ POSTGRES_DB: postgres
+ POSTGRES_PASSWORD: postgres
+ POSTGRES_USER: postgres
+ ports:
+ - 5432:5432
+ options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+ env:
+ PGPASSWORD: postgres
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
@@ -18,18 +31,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Setup PostgreSQL with PostGIS
- uses: huaxk/postgis-action@v1
- with:
- postgresql version: '11'
- postgresql db: 'postgres'
- postgresql user: 'postgres'
-
- - name: Install PostgreSQL dependencies
+ - name: Set up PostgreSQL
run: |
sudo apt-get update
sudo apt-get install -y gdal-bin
- psql -c "CREATE ROLE runner SUPERUSER LOGIN CREATEDB;" -U postgres -h localhost -p 5432
psql template1 -c "CREATE EXTENSION citext;" -U postgres -h localhost -p 5432
psql template1 -c "CREATE EXTENSION hstore;" -U postgres -h localhost -p 5432
psql template1 -c "CREATE EXTENSION postgis;" -U postgres -h localhost -p 5432
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e30a2b7..fdd2f2a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Changed
- Fixed a bug with `seq` being passed a tz-aware start value [PR #353](https://github.com/model-bakers/model_bakery/pull/353)
+- [dev] Use official postgis docker image in CI [PR #355](https://github.com/model-bakers/model_bakery/pull/355)
### Removed
diff --git a/tox.ini b/tox.ini
index 8595863a..1ce2db69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,7 @@ setenv =
PYTHONPATH={toxinidir}
postgresql: TEST_DB=postgis
postgresql: PGUSER=postgres
+ postgresql: PGPASSWORD=postgres
sqlite: TEST_DB=sqlite
sqlite: USE_TZ=True
deps =