Skip to content

Commit

Permalink
Temporarily disable vex pluging (#103)
Browse files Browse the repository at this point in the history
This is to avoid having to install custom python packages
  • Loading branch information
janhoy authored Jun 20, 2024
1 parent 08f9477 commit f8ab7ee
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ github:
protected_branches:
main
production

notifications:
jobs: janhoy@apache.org
issues: janhoy@apache.org
pullrequests: janhoy@apache.org
jira_options: link label worklog
1 change: 1 addition & 0 deletions .github/workflows/build-pelican.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ jobs:
with:
destination: ${{ github.ref == 'refs/heads/production' && 'asf-site' || 'asf-staging' }}
gfm: 'false'
version: '4.9.1'
34 changes: 34 additions & 0 deletions .github/workflows/pr-build-pelican.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 6 additions & 4 deletions pelicanconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -20,7 +20,9 @@

# 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'

Expand Down Expand Up @@ -97,14 +99,14 @@
'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': {},
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit f8ab7ee

Please sign in to comment.