From d24f239017a3514b144999b45c298e0c42396187 Mon Sep 17 00:00:00 2001 From: Andrei Pohilko Date: Tue, 31 Mar 2026 17:24:41 +0100 Subject: [PATCH 1/2] Fix: MkDocs should only process markdown, not all of dat/ Use temporary .mkdocs_src with only .md files instead of docs_dir=dat. This prevents MkDocs from copying repo JSONs, out.xml, etc into build. prepare-upload.sh copies dat/ separately for PHP/PWE. Co-Authored-By: Claude Opus 4.6 (1M context) --- prepare-upload.sh | 6 ++++-- site/build.sh | 11 +++++++++-- site/mkdocs.yml | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/prepare-upload.sh b/prepare-upload.sh index c8030c13d..fef82037f 100755 --- a/prepare-upload.sh +++ b/prepare-upload.sh @@ -19,13 +19,15 @@ cp -r examples upload/img/ # Merge repo JSON files into single file python merge_repo.py +# Non-MkDocs site files +cp -r site/dat upload/ +cp -r site/files upload/ 2>/dev/null || true + # PHP for /repo/ endpoint (stays dynamic) cp site/index.php upload/ cp site/cfg.php upload/ cp site/composer.json upload/ cp -r site/JPGC upload/ -cp site/dat/out.xml upload/dat/ -cp -r site/files upload/ 2>/dev/null || true php --version curl -sS https://getcomposer.org/installer | php diff --git a/site/build.sh b/site/build.sh index 6b7678154..bcf3db5d9 100755 --- a/site/build.sh +++ b/site/build.sh @@ -3,13 +3,20 @@ set -e cd "$(dirname "$0")" +# Assemble MkDocs source with only markdown files +rm -rf .mkdocs_src +mkdir -p .mkdocs_src/wiki .mkdocs_src/install +cp dat/wiki/*.md .mkdocs_src/wiki/ +cp dat/install/Install.md .mkdocs_src/install/ +cp dat/index.md dat/catalogue.md dat/stats.md .mkdocs_src/ + mkdocs build --clean +rm -rf .mkdocs_src + # Static assets not managed by MkDocs cp robots.txt build/ cp favicon.ico build/ 2>/dev/null || true cp -r img build/ -mkdir -p build/dat/stats -cp -r dat/repo build/dat/ echo "Build complete: build/" diff --git a/site/mkdocs.yml b/site/mkdocs.yml index fdf01b746..9cfd55935 100644 --- a/site/mkdocs.yml +++ b/site/mkdocs.yml @@ -2,7 +2,7 @@ site_name: JMeter-Plugins.org site_url: https://jmeter-plugins.org/ site_description: Custom plugins for Apache JMeter -docs_dir: dat +docs_dir: .mkdocs_src site_dir: build use_directory_urls: true From 7154545e8e844a7f62e1a6d4fa4fe6acee517f0c Mon Sep 17 00:00:00 2001 From: Andrei Pohilko Date: Tue, 31 Mar 2026 17:29:18 +0100 Subject: [PATCH 2/2] Fix: selective dat/ copy, MkDocs uses temp source dir Co-Authored-By: Claude Opus 4.6 (1M context) --- prepare-upload.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/prepare-upload.sh b/prepare-upload.sh index fef82037f..fb8501dd5 100755 --- a/prepare-upload.sh +++ b/prepare-upload.sh @@ -19,8 +19,10 @@ cp -r examples upload/img/ # Merge repo JSON files into single file python merge_repo.py -# Non-MkDocs site files -cp -r site/dat upload/ +# PWE data files for /repo/ endpoint +mkdir -p upload/dat +cp site/dat/out.xml upload/dat/ +cp -r site/dat/repo upload/dat/ cp -r site/files upload/ 2>/dev/null || true # PHP for /repo/ endpoint (stays dynamic)