Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 14 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.9'
- name: Install requirements
run: pip install flake8 pycodestyle
- name: Check syntax
Expand All @@ -21,16 +21,20 @@ jobs:
needs: lint
strategy:
matrix:
ckan-version: [2.9]
include:
- 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: openknowledge/ckan-dev:${{ matrix.ckan-version }}
image: ${{ matrix.ckan-image }}
options: --user root
services:
solr:
image: ckan/ckan-solr:${{ matrix.ckan-version }}
image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr${{ matrix.solr-version }}
postgres:
image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
env:
Expand All @@ -48,13 +52,16 @@ jobs:
CKAN_REDIS_URL: redis://redis:6379/1

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install extension
run: |
pip install -r dev-requirements.txt
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 requirements (CKAN >= 2.9)
if: ${{ matrix.ckan-version != '2.7' && matrix.ckan-version != '2.8' }}
run: |
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{% ckan_extends %}

{%- block header %}
<div class="alert alert-danger alert-dismissible mb-0" role="alert">
<strong>Southern California Wildfire Information:</strong> To support Californians impacted by the fires, the state has put together a new website where they can find the information such as real-time information on fires, location of shelters and resources, how to apply for financial assistance, and for alerts and safety tips: <a href="https://www.ca.gov/LAfires/" target="_blank">https://www.ca.gov/LAfires/</a>. For the latest park unit closures due to the fires, please visit <a href="https://www.parks.ca.gov/Incidents">parks.ca.gov/Incidents</a>.
</div>
{{ super() }}
{% endblock -%}
Loading