From 9534052bcc91166febe38e6d2ae4b5a118bde246 Mon Sep 17 00:00:00 2001 From: avdata99 Date: Wed, 26 Jul 2023 10:56:45 -0300 Subject: [PATCH] Split harvter version --- .github/workflows/test.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e8bb2bc..be94a82c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,12 +23,15 @@ jobs: - ckan-version: "2.10" solr-image: "2.10-spatial" requirements-file: 'requirements.txt' + harvester-version: 'master' - ckan-version: 2.9 solr-image: 2.9-solr8-spatial requirements-file: 'requirements.txt' + harvester-version: 'master' - ckan-version: 2.9-py2 solr-image: 2.9-py2-solr8-spatial requirements-file: 'requirements-py2.txt' + harvester-version: '1.4.2' fail-fast: false name: CKAN ${{ matrix.ckan-version }}, Solr ${{ matrix.solr-image }} @@ -95,16 +98,10 @@ jobs: pip install cython==0.29.36 pip install --no-use-pep517 pyproj==2.6.1 - - name: Patch to test pyproj - if: ${{ matrix.ckan-version == '2.10' }} - run: | - pip install cython==0.29.36 - pip install --no-use-pep517 pyproj==3.4.1 - - name: Patch to test pyproj if: ${{ matrix.ckan-version == '2.9-py2' }} run: | - pip install cython==0.29.36 + pip install cython==0.28.4 pip install --no-use-pep517 pyproj==2.2.2 - name: Install dependencies from ${{ matrix.requirements-file }} @@ -116,7 +113,7 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | echo "Installing harvester" - git clone --depth 1 https://github.com/ckan/ckanext-harvest + git clone --depth 1 --branch ${{ matrix.harvester-version }} https://github.com/ckan/ckanext-harvest cd ckanext-harvest echo "upgrade pip" pip install --upgrade pip