From 2f5d4b9e83b020dda15fe1d10f6204bd508fb706 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Sat, 25 Mar 2023 15:15:26 -0700 Subject: [PATCH 01/21] Update LICENSE updated to BSD 3-clause license --- LICENSE | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/LICENSE b/LICENSE index 2baf1d04e..8e36b7b38 100644 --- a/LICENSE +++ b/LICENSE @@ -1,44 +1,13 @@ -# Licenses - -* Software: University of Illinois/NCSA Open Source License (MIT/BSD compatible) -* Data: Open Data Commons Attribution License (ODC-By) v1.0 - -## Software License - -University of Illinois/NCSA Open Source License +## BSD 3-clause Open Source Software License Copyright (c) 2015, University of Illinois, NCSA. All rights reserved. -BETYdb -www.betydb.org - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal with the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimers. -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. -- Neither the names of University of Illinois, NCSA, nor the names - of its contributors may be used to endorse or promote products - derived from this Software without specific prior written permission. +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -## Data License +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -All public data in BETYdb is made available under the Open Data Commons Attribution License (ODC-By) v1.0. -You are free to share, create, and adapt its contents. -Data with an access_level field and value <= 2 is is not covered by this license, but may be available for use with consent. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 01259fcad6b9b3025ada6a321257a3bf29f8d961 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Sat, 25 Mar 2023 15:17:56 -0700 Subject: [PATCH 02/21] Update .zenodo.json change license --- .zenodo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zenodo.json b/.zenodo.json index 5119eefb5..f30f4076f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -58,7 +58,7 @@ ], "language":"eng", "license":{ - "id":"NCSA" + "id":"BSD 3-Clause" }, "references":[ "LeBauer, D., Kooper, R., Mulrooney, P., Rohde, S., Wang, D., Long, S. P., & Dietze, M. C. (2018). BETYdb: a yield, trait, and ecosystem service database applied to second\u2010generation bioenergy feedstock production. GCB Bioenergy, 10(1), 61-71", From c42896d8beb4219c7f41e13177d07868a1e82006 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Mon, 27 Mar 2023 17:08:52 -0700 Subject: [PATCH 03/21] Update ci.yml update to ruby/setup-ruby per message in broken build https://github.com/PecanProject/bety/actions/runs/4521577229/jobs/7963396670 ``` Run actions/setup-ruby@v1 ------------------------ NOTE: This action is deprecated and is no longer maintained. Please, migrate to https://github.com/ruby/setup-ruby, which is being actively maintained. ------------------------ ``` --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 869f598b3..6069ce2fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: restore-keys: | ${{ runner.os }}-gems- - name: Set up Ruby ${{ matrix.ruby }} - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - name: Install libraries From d4cad365ae37077c48e88d1fb5f4fc4aa2c4a63f Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 09:53:02 -0700 Subject: [PATCH 04/21] [WIP] test against newer PostGIS Update ci.yml - added mdillon/postgis:11 and postgis/postgis:12.3 as matrix - also, against Ruby 3.0 just in case it works / to see where it will break! --- .github/workflows/ci.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6069ce2fb..440327c50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,21 +18,27 @@ jobs: fail-fast: false matrix: ruby: - - 2.5 - - 2.6 - # - 2.7 is not supported, results in error + - 2.7 + - 3.0 + postgres: + - image: mdillon/postgis:9.5 + port: 5432 + - image: mdillon/postgis:11 + port: 5433 + - image: postgis/postgis:12.3.3 + port: 5434 services: postgres: - image: mdillon/postgis:9.5 + image: ${{ matrix.postgres.image }} ports: - - 5432:5432 + - ${{ matrix.postgres.port }}::5432 options: >- --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/cache@v1 with: path: vendor/bundle @@ -75,6 +81,6 @@ jobs: docker: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build image run: docker build --tag image --file Dockerfile . From de9f26736dd73848aaea8efc1920ae0c59aca86b Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 10:01:13 -0700 Subject: [PATCH 05/21] fix matrix syntax need different names for postgres_images in matrix --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 440327c50..fff4a667d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: ruby: - 2.7 - 3.0 - postgres: + postgres_images: - image: mdillon/postgis:9.5 port: 5432 - image: mdillon/postgis:11 @@ -29,9 +29,9 @@ jobs: port: 5434 services: postgres: - image: ${{ matrix.postgres.image }} + image: ${{ matrix.postgres_images.image }} ports: - - ${{ matrix.postgres.port }}::5432 + - ${{ matrix.postgres_images.port }}:5432 options: >- --health-cmd pg_isready --health-interval 10s From 9bfd55902a6b01323ea7bf234bc1c55cae016f9f Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 10:33:34 -0700 Subject: [PATCH 06/21] Update ci.yml fix port specifications --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fff4a667d..3fa2a3b9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,19 +19,19 @@ jobs: matrix: ruby: - 2.7 - - 3.0 postgres_images: - image: mdillon/postgis:9.5 - port: 5432 - image: mdillon/postgis:11 - port: 5433 - image: postgis/postgis:12.3.3 - port: 5434 + postgres_ports: + - 5432 + - 5433 + - 5434 services: postgres: image: ${{ matrix.postgres_images.image }} ports: - - ${{ matrix.postgres_images.port }}:5432 + - ${{ matrix.postgres_ports.port }}:5432 options: >- --health-cmd pg_isready --health-interval 10s From c68bf5a366b3c1fe6992f34493914856666e5837 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 10:43:00 -0700 Subject: [PATCH 07/21] Update ci.yml --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fa2a3b9d..d7c3f48d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,27 +19,27 @@ jobs: matrix: ruby: - 2.7 - postgres_images: - - image: mdillon/postgis:9.5 - - image: mdillon/postgis:11 - - image: postgis/postgis:12.3.3 - postgres_ports: - - 5432 - - 5433 - - 5434 + postgres_image: + - mdillon/postgis:9.5 + - mdillon/postgis:11 + - postgis/postgis:12.3.3 services: postgres: - image: ${{ matrix.postgres_images.image }} + image: ${{ matrix.postgres_image }} ports: - - ${{ matrix.postgres_ports.port }}:5432 + - ${{ job.services.postgres.ports[0] }}:5432 options: >- --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v1 + - name: Set port number + run: echo "PORT_NUMBER=$(((RANDOM % 30000) + 1024))" >> $GITHUB_ENV + - name: Checkout code + uses: actions/checkout@v3 + - name: Restore cache + uses: actions/cache@v1 with: path: vendor/bundle key: ${{ runner.os }}-gems-${{ matrix.ruby}}-${{ hashFiles('**/Gemfile.lock') }} From 38e0d44b24043145732e28f04c35aaaab2becb5f Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 11:59:13 -0700 Subject: [PATCH 08/21] just testing ruby 2.7 x postgis 11 --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7c3f48d8..36975eb31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,22 +20,20 @@ jobs: ruby: - 2.7 postgres_image: - - mdillon/postgis:9.5 + # - mdillon/postgis:9.5 - mdillon/postgis:11 - - postgis/postgis:12.3.3 + # - postgis/postgis:12.3.3 services: postgres: image: ${{ matrix.postgres_image }} ports: - - ${{ job.services.postgres.ports[0] }}:5432 + - 5432:5432 options: >- --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - - name: Set port number - run: echo "PORT_NUMBER=$(((RANDOM % 30000) + 1024))" >> $GITHUB_ENV - name: Checkout code uses: actions/checkout@v3 - name: Restore cache From 25b0ccbe246be4ddb480762d8764b55f692633e1 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 12:01:43 -0700 Subject: [PATCH 09/21] unencrypted password no longer supported in posgres 11 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36975eb31..7cc2e9ac6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: RAILS_ENV: test run: | cp config/database.yml.gh config/database.yml - psql -h localhost -U postgres -c "CREATE USER bety WITH SUPERUSER CREATEDB UNENCRYPTED PASSWORD 'bety'"; + psql -h localhost -U postgres -c "CREATE USER bety WITH SUPERUSER CREATEDB PASSWORD 'bety'"; psql -h localhost -U postgres -c "DROP DATABASE IF EXISTS test;" psql -h localhost -U postgres -c "CREATE DATABASE test WITH OWNER bety;" psql -h localhost -U bety -d test -c "CREATE EXTENSION postgis;" From 0704bbbb1046fb595622ef28b8e0b49e61c5426e Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 12:59:47 -0700 Subject: [PATCH 10/21] test postgis/postgis:12.1 --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cc2e9ac6..9831a19ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,9 +20,7 @@ jobs: ruby: - 2.7 postgres_image: - # - mdillon/postgis:9.5 - - mdillon/postgis:11 - # - postgis/postgis:12.3.3 + - postgis/postgis:12.3.3 services: postgres: image: ${{ matrix.postgres_image }} From 3b6ff7799bc3f1fbf22b49437002334a35127a49 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 13:22:47 -0700 Subject: [PATCH 11/21] Update .github/workflows/ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9831a19ef..dd73d9619 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: ruby: - 2.7 postgres_image: - - postgis/postgis:12.3.3 + - postgis/postgis:12-3.3 services: postgres: image: ${{ matrix.postgres_image }} From ba3512a139b1ebc97093fe9873fe913133dcd31f Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 14:09:59 -0700 Subject: [PATCH 12/21] Fix error by setting POSTGRES_PASSWORD env variable Error: Database is uninitialized and superuser password is not specified. You must specify POSTGRES_PASSWORD to a non-empty value for the superuser. For example, "-e POSTGRES_PASSWORD=password" on "docker run". You may also use "POSTGRES_HOST_AUTH_METHOD=trust" to allow all connections without a password. This is *not* recommended. See PostgreSQL documentation about "trust": https://www.postgresql.org/docs/current/auth-trust.html Error: Failed to initialize container postgis/postgis:12-3.3 Error: One or more containers failed to start. --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd73d9619..016030109 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,8 @@ jobs: services: postgres: image: ${{ matrix.postgres_image }} + env: + POSTGRES_PASSWORD: bety ports: - 5432:5432 options: >- From d185bec9470711da1ede4e3edc53bf99351d2913 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 14:17:46 -0700 Subject: [PATCH 13/21] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 016030109..365269b50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,7 @@ jobs: - name: Build and test with Rake env: RAILS_ENV: test + POSTGRES_PASSWORD: bety run: | cp config/database.yml.gh config/database.yml psql -h localhost -U postgres -c "CREATE USER bety WITH SUPERUSER CREATEDB PASSWORD 'bety'"; From 635ee030702cafbee63a700f31ddddf23770fbfc Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 14:26:17 -0700 Subject: [PATCH 14/21] Update database.yml.gh --- config/database.yml.gh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.yml.gh b/config/database.yml.gh index 4cb5e878e..a76f646ba 100644 --- a/config/database.yml.gh +++ b/config/database.yml.gh @@ -5,6 +5,6 @@ test: database: test pool: 5 username: postgres - password: + password: bety host: localhost port: 5432 From 0d199f440434a2fa09bd5167b40a93e80a2d074c Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 14:26:53 -0700 Subject: [PATCH 15/21] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 365269b50..4106ceca7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,6 +63,7 @@ jobs: env: RAILS_ENV: test POSTGRES_PASSWORD: bety + PGPASSWORD: bety run: | cp config/database.yml.gh config/database.yml psql -h localhost -U postgres -c "CREATE USER bety WITH SUPERUSER CREATEDB PASSWORD 'bety'"; From 924bb211a7ac2b7f0b86f650d6d041136cb4eed7 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 14:45:20 -0700 Subject: [PATCH 16/21] Update docker-compose.yml --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 23cfc84d6..0e4553d44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,9 @@ services: # postgresql + postgis to hold all the data postgres: - image: mdillon/postgis:9.5 + image: postgis/postgis:12-3.3 + env: + POSTGRES_PASSWORD: bety networks: - bety #ports: From bad296c57a38cf31a7f75078d8c6ea127daa0a42 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 14:46:33 -0700 Subject: [PATCH 17/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7361d0fb8..69d50cba7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6 +FROM ruby:2.7 LABEL maintainer="Max Burnette , Rob Kooper " # arguments that are added at the bottom of BETY From 6f44962a44ee1cc5b151d3ea968f07371918fa6c Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 14:50:23 -0700 Subject: [PATCH 18/21] Update .ruby-version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 1a8e8ebba..80b0e7ef4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.5.9 +ruby-2.7.7 From 22e4bda6982e152e79bb0279bd84c084f2d2cfaf Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Tue, 28 Mar 2023 17:01:44 -0700 Subject: [PATCH 19/21] Update CHANGELOG.md --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67c1b4bc0..25eff0a90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,19 @@ You will need to install the latest version of BETY (or the version you want to In this case you can simply pull down the version you want, and run `docker-compose bety migrate`. +## [5.x] - + +### Changed + +- License changed from UIUC/NCSA to BSD 3-Clause [#748](https://github.com/PecanProject/bety/pull/758). + The licenses are functionally the same, but BSD 3-Clause is more widely recognized. + This change is consistent with moving R packages in PEcAn project to BSD 3-Clause to comply with CRAN requirements. +- Updated GitHub actions to test and use supported versions of Rails (v2.7) and Postgres (12.3.3) [#753](https://github.com/PecanProject/bety/pull/753) + - **Important** Users who use the docker-compose file will need to either: + - dump the database first and then reload because this involves a database version upgrade + - switch the postgres image back to mdillon/postgis:9.5. This is not recommended because postgres v9.5 is no longer supported. + + ## [5.4.1] - 2021-10-10 ### Changed From 6768e76358c9ef4bb9ffe78270b8492fb7727a43 Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Wed, 29 Mar 2023 10:32:16 -0700 Subject: [PATCH 20/21] added posgres 15.3.3 to gh action matrix --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4106ceca7..a681c904a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,7 @@ jobs: - 2.7 postgres_image: - postgis/postgis:12-3.3 + - kartoza/postgis:15-3.3 services: postgres: image: ${{ matrix.postgres_image }} From 1457e6abcbb0d1c8879c1883767b80bca6922acb Mon Sep 17 00:00:00 2001 From: David LeBauer Date: Wed, 29 Mar 2023 10:41:05 -0700 Subject: [PATCH 21/21] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a681c904a..4106ceca7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,6 @@ jobs: - 2.7 postgres_image: - postgis/postgis:12-3.3 - - kartoza/postgis:15-3.3 services: postgres: image: ${{ matrix.postgres_image }}