From 9295ed3a3f5227ddddd65b18b3b75fc3ecfbd5de Mon Sep 17 00:00:00 2001 From: amercader Date: Mon, 1 Jul 2024 15:34:56 +0200 Subject: [PATCH] Use new python images --- .github/workflows/test.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cdfd7e74..74d11095 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,12 +21,15 @@ jobs: matrix: include: - ckan-version: "master" + ckan-image: "ckan/ckan-dev:master-py3.10" solr-image: "2.10-solr9-spatial" harvester-version: 'master' - ckan-version: "2.10" + ckan-image: "ckan/ckan-dev:2.10-py3.10" solr-image: "2.10-solr9-spatial" harvester-version: 'master' - ckan-version: 2.9 + ckan-image: "amercader/ckan-dev:2.9-py3.9" solr-image: 2.9-solr9-spatial harvester-version: 'master' fail-fast: false @@ -34,7 +37,7 @@ jobs: name: CKAN ${{ matrix.ckan-version }}, Solr ${{ matrix.solr-image }} runs-on: ubuntu-latest container: - image: ckan/ckan-dev:${{ matrix.ckan-version }} + image: ${{ matrix.ckan-image }} services: solr: image: ckan/ckan-solr:${{ matrix.solr-image }} @@ -60,16 +63,11 @@ jobs: - name: Install dependencies (common) run: | - apk add --no-cache \ - geos \ - geos-dev \ - proj-util \ - proj-dev \ - libxml2 \ - libxslt \ - gcc \ + apt-get install \ + python-dev \ libxml2-dev \ - libxslt-dev + libxslt1-dev \ + libgeos-c1 - name: Enable pip cache run: |