Revert PG12 + Python3
This commit is contained in:
parent
b1830e49af
commit
eea750c904
@ -16,7 +16,9 @@ jobs:
|
||||
- env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5"
|
||||
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
|
||||
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
|
||||
|
||||
allow_failures:
|
||||
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
|
||||
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
|
||||
|
||||
script:
|
||||
- sudo service postgresql stop;
|
||||
|
4
Makefile
4
Makefile
@ -138,7 +138,9 @@ PG_VERSION := $(shell $(PG_CONFIG) --version | $(AWK) '{split($$2,a,"."); print
|
||||
PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
|
||||
PLPYTHONU := plpythonu
|
||||
ifeq ($(PG_12_GE), true)
|
||||
PLPYTHONU := plpython3u
|
||||
# Reverted until we are ready for PG12 support in other projects
|
||||
PLPYTHONU := plpythonu
|
||||
# PLPYTHONU := plpython3u
|
||||
endif
|
||||
|
||||
$(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile
|
||||
|
Loading…
Reference in New Issue
Block a user