Skip to content

Display formatted error messages with pre tag #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jguo144 merged 2 commits into from
Mar 7, 2025
Merged

Display formatted error messages with pre tag #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dd09de
Display formatted error messages with pre tag
jguo144 Mar 7, 2025
9c6668d
Update github actions
jguo144 Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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: |
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ckanext/harvest/templates/snippets/job_error_summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{% for error in summary %}
<tr>
<td class="count">{{ error["error_count"] }}</td>
<td>{{ error["message"] }}</td>
<td><pre style="padding:0">{{ error["message"] }}</pre></td>
</tr>
{% endfor %}
</tbody>
Expand Down