Merge pull request #108 from janhoy/Build-pr-with-infra-action

Re-enable VEX plugin and use infra action for PR build

.github/workflows/pr-build-pelican.yml

@@ -10,25 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        # This is the version of the action for setting up Python, not the Python version.
-        uses: actions/setup-python@v5
+      - name: Build Pelican Site
+        uses: apache/infrastructure-actions/pelican@main
         with:
-          python-version: '3.x'
-      - name: Display Python version
-        run: python -c "import sys; print(sys.version)"
-      - name: Install Pelican
-        shell: bash
-        # Install needs to run in separate shell so stdout is restored
-        run: |
-          (
-            pip3 install pelican==4.9.1 markdown bs4 ezt requests 
-          )
-          python3 -V
-          echo "Pelican version:"
-          pelican --version
-      # If the site uses Github Flavored Markdown, use this build branch
-      - name: Generate website from markdown
-        shell: bash
-        run: |
-          python3 -B -m pelican content
+          gfm: 'false'
+          version: '4.9.1'
+          publish: 'false'
+          debug: 'false'

pelicanconf.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*- #
 from __future__ import unicode_literals
 from datetime import datetime, date
-#from checksumdir import dirhash
+from checksumdir import dirhash
 
 AUTHOR = 'Solr Developers'
 SITENAME = 'Apache Solr'
@@ -20,9 +20,7 @@
 
 # This string will be appended to all unversioned css and js resources to prevent caching surprises on edits.
 # The theme's htaccess file also sets a cache-control header with longer lifetime, if the v=XXXX query string is added.
-#STATIC_RESOURCE_SUFFIX = "?v=%s" % dirhash('themes/solr/static', 'sha1')[-8:]
-# SOLR-17339: Dynamic hash disabled until we can install custom modules like checksumdir. Bump this manually on changes
-STATIC_RESOURCE_SUFFIX = "?v=4dd59757"
+STATIC_RESOURCE_SUFFIX = "?v=%s" % dirhash('themes/solr/static', 'sha1')[-8:]
 
 PATH = 'content'
 
@@ -99,8 +97,7 @@
     'jinja2content',
     'regex_replace',
     'age_days_lt',
-# SOLR-17339: Vex disabled until https://github.com/apache/infrastructure-actions/pull/63 is merged
-#    'vex'
+    'vex'
 #    'md_inline_extension',
 ]
 

requirements.txt

@@ -1,12 +1,12 @@
 pelican~=4.9.1
 Markdown~=3.4
-#checksumdir~=1.2.0
+checksumdir~=1.2.0
 
 # Pelican plugins
 beautifulsoup4~=4.12.3
 # Dependencies of the vex plugin
-#jsonschema~=4.22.0
-#jsonref~=1.1.0
+jsonschema~=4.22.0
+jsonref~=1.1.0
 
 # Dev tools
 invoke~=2.2.0