Skip to content

Commit 347ab46

Browse files
⚒ Disable Javadocs generation for nightly docs & improvements (#6059)
* Let's see if I am good at GH actions 🤞 * ops! * Use proper docs template reference when possible * Disable nightly javadocs generation with an option Each javadoc is ~50mb, which was causing the big size of the docs! while each docs generation is ~2mb only * Fix building * Revert pull changes They are not what fixed the issue, probably the old PRs aren't syncing for some reason * Update build.gradle --------- Co-authored-by: Moderocky <admin@moderocky.com>
1 parent e618afa commit 347ab46

File tree

8 files changed

+25
-10
lines changed

8 files changed

+25
-10
lines changed

.github/workflows/docs/generate-docs/action.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ inputs:
2323
required: false
2424
default: "*"
2525
type: string
26+
generate_javadocs:
27+
description: "Designates whether to generate javadocs for this nightly documentation"
28+
required: false
29+
default: false
30+
type: boolean
2631

2732
outputs:
2833
DOCS_CHANGED:
@@ -41,6 +46,7 @@ runs:
4146
SKRIPT_REPO_DIR: ${{ inputs.skript_repo_dir }}
4247
IS_RELEASE: ${{ inputs.is_release }}
4348
CLEANUP_PATTERN: ${{ inputs.cleanup_pattern }}
49+
GENERATE_JAVADOCS: ${{ inputs.generate_javadocs }}
4450
run: |
4551
replace_in_directory() {
4652
find $1 -type f -exec sed -i -e "s/$2/$3/g" {} \;
@@ -55,7 +61,7 @@ runs:
5561
if [ -d "${DOCS_REPO_DIR}/docs/templates" ]
5662
then
5763
export SKRIPT_DOCS_TEMPLATE_DIR=${DOCS_REPO_DIR}/docs/templates
58-
else
64+
else # compatibility for older versions
5965
export SKRIPT_DOCS_TEMPLATE_DIR=${DOCS_REPO_DIR}/doc-templates
6066
fi
6167
@@ -64,12 +70,16 @@ runs:
6470
cd $SKRIPT_REPO_DIR
6571
if [[ "${IS_RELEASE}" == "true" ]]; then
6672
./gradlew genReleaseDocs releaseJavadoc
67-
else
73+
elif [[ "${GENERATE_JAVADOCS}" == "true" ]]; then
6874
./gradlew genNightlyDocs javadoc
75+
else
76+
./gradlew genNightlyDocs
6977
fi
7078
7179
if [ -d "${DOCS_OUTPUT_DIR}" ]; then
72-
mkdir -p "${SKRIPT_DOCS_OUTPUT_DIR}/javadocs" && cp -a "./build/docs/javadoc/." "$_"
80+
if [[ "${GENERATE_JAVADOCS}" == "true" ]]; then
81+
mkdir -p "${SKRIPT_DOCS_OUTPUT_DIR}/javadocs" && cp -a "./build/docs/javadoc/." "$_"
82+
fi
7383
7484
mkdir -p "/tmp/normalized-output-docs" && cp -a "${DOCS_OUTPUT_DIR}/." "$_"
7585
mkdir -p "/tmp/normalized-generated-docs" && cp -a "${SKRIPT_DOCS_OUTPUT_DIR}/." "$_"

.github/workflows/nightly-docs.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ name: Nightly documentation
33
on:
44
push:
55
branches:
6-
- '**'
6+
- 'dev/feature'
7+
- 'dev/patch'
8+
- 'enhancement/**'
9+
- 'feature/**'
10+
- 'fix/**'
711
tags-ignore:
812
- '**'
913

src/main/java/ch/njol/skript/SkriptCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ else if (args[0].equalsIgnoreCase("info")) {
398398
else if (args[0].equalsIgnoreCase("gen-docs")) {
399399
File templateDir = Documentation.getDocsTemplateDirectory();
400400
if (!templateDir.exists()) {
401-
Skript.error(sender, "Cannot generate docs! Documentation templates not found at 'plugins/Skript/doc-templates/'");
401+
Skript.error(sender, "Cannot generate docs! Documentation templates not found at '" + Documentation.getDocsTemplateDirectory().getPath() + "'");
402402
TestMode.docsFailed = true;
403403
return true;
404404
}

src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package ch.njol.skript;
2020

21+
import ch.njol.skript.doc.Documentation;
2122
import ch.njol.skript.test.runner.TestMode;
2223
import ch.njol.util.StringUtils;
2324
import org.bukkit.command.Command;
@@ -116,7 +117,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
116117
options.add("disable");
117118
options.add("update");
118119
options.add("info");
119-
if (new File(Skript.getInstance().getDataFolder() + "/doc-templates").exists())
120+
if (Documentation.getDocsTemplateDirectory().exists())
120121
options.add("gen-docs");
121122
if (TestMode.DEV_MODE)
122123
options.add("test");

src/main/resources/lang/english.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ skript command:
4545
changes: Lists all changes since the current version
4646
download: Download the newest version
4747
info: Prints a message with links to Skript's aliases and documentation
48-
gen-docs: Generates documentation using doc-templates in plugin folder
48+
gen-docs: Generates documentation using docs/templates in plugin folder
4949
test: Used for running internal Skript tests
5050

5151
invalid script: Can't find the script <grey>'<gold>%s<grey>'<red> in the scripts folder!

src/main/resources/lang/french.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ skript command:
4545
changes: Liste toutes les modifications apportées depuis la version actuelle
4646
download: Télécharge la dernière version
4747
info: Affiche un message contenant les liens vers les alias et la documentation de Skript
48-
gen-docs: Génère la documentation en utilisant doc-templates dans le dossier du plugin
48+
gen-docs: Génère la documentation en utilisant docs/templates dans le dossier du plugin
4949
test: Utilisé pour exécuter les tests Skript
5050

5151
invalid script: Impossible de trouver le script <grey>'<gold>%s<grey>'<red> dans le dossier des scripts !

src/main/resources/lang/german.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ skript command:
4545
changes: Listet alle Änderungen seit der aktuellen Version auf (auf englisch)
4646
download: Lädt die neueste Version herunter
4747
info: Druckt eine Nachricht mit Links zu den Aliases und der Dokumentation von Skript.
48-
gen-docs: Generiert Dokumentation mithilfe von doc-templates im Plugin-Ordner
48+
gen-docs: Generiert Dokumentation mithilfe von docs/templates im Plugin-Ordner
4949
test: Wird zum Ausführen von Skript-Tests verwendet
5050

5151
invalid script: Das Skript <grey>'<gold>%s<grey>'<red> konnte nicht gefunden werden.

src/main/resources/lang/simplifiedchinese.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ skript command:
4545
changes: 列出自当前版本以来的所有变化
4646
download: 下载最新的版本
4747
info: 打印一个带有Skript的别名和文档链接的信息
48-
gen-docs: 使用插件文件夹中的doc-templates生成文档
48+
gen-docs: 使用插件文件夹中的docs/templates生成文档
4949
test: 用于运行内部的Skript测试
5050

5151
invalid script: 无法在scripts文件夹中找到脚本<grey>“<gold>%s<grey>”<red>!

0 commit comments

Comments
 (0)