diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac180f66..21188534 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,16 +19,26 @@ jobs: needs: lint strategy: matrix: - ckan-version: ["2.11", "2.10", 2.9] + include: + - ckan-version: "2.11" + ckan-image: "ckan/ckan-dev:2.11-py3.10" + solr-version: "9" + - ckan-version: "2.10" + ckan-image: "ckan/ckan-dev:2.10-py3.10" + solr-version: "9" + - ckan-version: "2.9" + ckan-image: "ckan/ckan-dev:2.9-py3.9" + solr-version: "8" fail-fast: false name: CKAN ${{ matrix.ckan-version }} runs-on: ubuntu-latest container: - image: ckan/ckan-dev:${{ matrix.ckan-version }} + image: ${{ matrix.ckan-image }} + options: --user root services: solr: - image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr9 + image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr${{ matrix.solr-version }} postgres: image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }} env: @@ -56,6 +66,9 @@ jobs: pip install -e . # Replace default path to CKAN core config file with the one on the container sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini + # Install unzip for SonarQube Scan + apt-get update + apt-get install unzip -y - name: Install requirements for other CKAN versions if: matrix.ckan-version != '2.9' run: | @@ -64,6 +77,9 @@ jobs: pip install -e . # Replace default path to CKAN core config file with the one on the container sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini + # Install unzip for SonarQube Scan + apt-get update + apt-get install unzip -y - name: Setup extension (CKAN >= 2.9) run: | ckan -c test.ini db init diff --git a/ckanext/harvest/templates/snippets/job_error_summary.html b/ckanext/harvest/templates/snippets/job_error_summary.html index 5bad19f7..82f3ee36 100644 --- a/ckanext/harvest/templates/snippets/job_error_summary.html +++ b/ckanext/harvest/templates/snippets/job_error_summary.html @@ -23,7 +23,7 @@ {% for error in summary %} {{ error["error_count"] }} - {{ error["message"] }} +
{{ error["message"] }}
{% endfor %}