fix: publish workflow

ckan · Dec 16, 2024 · 9a711a6 · 9a711a6
1 parent 66fec83
commit 9a711a6
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -76,12 +76,20 @@ jobs:
         include: #ckan-image see https://github.com/ckan/ckan-docker-base, ckan-version controls other image tags
 #          - ckan-version: "2.11"
 #            ckan-image: "2.11-py3.10"
+#            ckan-solr: "2.11-solr9"
+#            experimental: false
 #          - ckan-version: "2.10"
 #            ckan-image: "2.10-py3.10"
+#            ckan-solr: "2.10-solr9"
+#            experimental: false
           - ckan-version: "2.9"
             ckan-image: "2.9-py3.9"
-          #- ckan-version: "master" Publish does not care about master
-          #  ckan-image: "master"
+            ckan-solr: "2.9-solr8"
+            experimental: false
+#          - ckan-version: "master"
+#            ckan-image: "master"
+#            ckan-solr: "master-solr9"
+#            experimental: true  # master is unstable, good to know if we are compatible or not
       fail-fast: false
 
     name: CKAN ${{ matrix.ckan-version }}
@@ -91,7 +99,7 @@ jobs:
       options: --user root
     services:
       solr:
-        image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr9
+        image: ckan/ckan-solr:${{ matrix.ckan-solr }}
       postgres:
         image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
         env:
@@ -125,6 +133,11 @@ jobs:
         # 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
 
+    - name: Pin jinja2 for ckan 2.9 only (last jinja version that had escape class)
+      if: ${{ matrix.ckan-version == 2.9 }}
+      run: pip install "jinja2<3.1"
+      continue-on-error: ${{ matrix.experimental }}
+
     - name: Setup extension
       run: |
         ckan -c test.ini db init