Skip to content

Commit fb22c95

Browse files
authored
Update test.yml
1 parent 6233224 commit fb22c95

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

.github/workflows/test.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,25 @@ jobs:
1818
needs: lint
1919
strategy:
2020
matrix:
21-
ckan-version: ["2.10", "2.11"]
21+
include:
22+
- ckan-version: "2.11"
23+
ckan-image: "ckan/ckan-dev:2.11-py3.10"
24+
solr-image: "2.11-solr9-spatial"
25+
harvester-version: 'master'
26+
- ckan-version: "2.10"
27+
ckan-image: "ckan/ckan-dev:2.10-py3.10"
28+
solr-image: "2.10-solr9-spatial"
29+
harvester-version: 'master'
2230
fail-fast: false
2331

24-
name: CKAN ${{ matrix.ckan-version }}
32+
name: CKAN ${{ matrix.ckan-version }}, Solr ${{ matrix.solr-image }}
2533
runs-on: ubuntu-latest
2634
container:
27-
image: ckan/ckan-dev:${{ matrix.ckan-version }}
35+
image: ${{ matrix.ckan-image }}
36+
options: --user root
2837
services:
2938
solr:
30-
image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr9
39+
image: ckan/ckan-solr:${{ matrix.solr-image }}
3140
postgres:
3241
image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
3342
env:
@@ -36,14 +45,14 @@ jobs:
3645
POSTGRES_DB: postgres
3746
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
3847
redis:
39-
image: redis:3
48+
image: redis:7
4049
env:
4150
CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
4251
CKAN_DATASTORE_WRITE_URL: postgresql://datastore_write:pass@postgres/datastore_test
4352
CKAN_DATASTORE_READ_URL: postgresql://datastore_read:pass@postgres/datastore_test
4453
CKAN_SOLR_URL: http://solr:8983/solr/ckan
4554
CKAN_REDIS_URL: redis://redis:6379/1
46-
55+
4756
steps:
4857
- uses: actions/checkout@v3
4958
- name: Install requirements
@@ -63,4 +72,4 @@ jobs:
6372
- name: Upload coverage report to codecov
6473
uses: codecov/codecov-action@v1
6574
with:
66-
file: ./coverage.xml
75+
file: ./coverage.xml--cov=ckanext.matolabtheme

0 commit comments

Comments
 (0)