This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-site.git
The following commit(s) were added to refs/heads/main by this push:
new f8ab7ee09 Temporarily disable vex pluging (#103)
f8ab7ee09 is described below
commit f8ab7ee097dd0fa9d5db51696a8afd5dee532cc9
Author: Jan Høydahl <[email protected]>
AuthorDate: Thu Jun 20 21:33:01 2024 +0200
Temporarily disable vex pluging (#103)
This is to avoid having to install custom python packages
---
.asf.yaml | 6 ++++++
.github/workflows/build-pelican.yml | 1 +
.github/workflows/pr-build-pelican.yml | 34 ++++++++++++++++++++++++++++++++++
pelicanconf.py | 10 ++++++----
requirements.txt | 8 ++++----
5 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 27f36d03f..61e541f93 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -14,3 +14,9 @@ github:
protected_branches:
main
production
+
+notifications:
+ jobs: [email protected]
+ issues: [email protected]
+ pullrequests: [email protected]
+ jira_options: link label worklog
diff --git a/.github/workflows/build-pelican.yml
b/.github/workflows/build-pelican.yml
index 48dc22103..b5d534a1d 100644
--- a/.github/workflows/build-pelican.yml
+++ b/.github/workflows/build-pelican.yml
@@ -20,3 +20,4 @@ jobs:
with:
destination: ${{ github.ref == 'refs/heads/production' && 'asf-site'
|| 'asf-staging' }}
gfm: 'false'
+ version: '4.9.1'
diff --git a/.github/workflows/pr-build-pelican.yml
b/.github/workflows/pr-build-pelican.yml
new file mode 100644
index 000000000..08524ca59
--- /dev/null
+++ b/.github/workflows/pr-build-pelican.yml
@@ -0,0 +1,34 @@
+name: Build Solr website with ASF Pelican action for PRs
+
+on:
+ pull_request:
+ branches:
+ - '**'
+
+jobs:
+ build-pelican:
+ 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
+ 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
diff --git a/pelicanconf.py b/pelicanconf.py
index 0eccde506..7f1d1b914 100755
--- a/pelicanconf.py
+++ b/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,7 +20,9 @@ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE = 'v0.7.1'
# 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:]
+#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"
PATH = 'content'
@@ -97,14 +99,14 @@ PLUGINS = [
'jinja2content',
'regex_replace',
'age_days_lt',
- 'vex'
+# SOLR-17339: Vex disabled until
https://github.com/apache/infrastructure-actions/pull/63 is merged
+# 'vex'
# 'md_inline_extension',
]
MARKDOWN = {
'extension_configs': {
'toc': {},
- 'mdx_include': {},
'markdown.extensions.codehilite': {'css_class': 'codehilite'},
'markdown.extensions.extra': {},
'markdown.extensions.meta': {},
diff --git a/requirements.txt b/requirements.txt
index 814be3809..a1ef6b666 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
pelican~=4.5.4
Markdown~=3.3.3
-checksumdir~=1.2.0
+#checksumdir~=1.2.0
# Pelican plugins
-mdx-include~=1.4.1
+#mdx-include~=1.4.1
beautifulsoup4~=4.9.3
# Dependencies of the vex plugin
-jsonschema~=4.17.3
-jsonref~=1.0.1
+#jsonschema~=4.17.3
+#jsonref~=1.0.1
# Dev tools
invoke~=1.5.0
