From 06d05691b906d566b2a8f7e069a4521cc9fa6dba Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Tue, 31 Jan 2023 15:32:39 -0600 Subject: [PATCH] Override collector config for 6.0.0-RC1 Closes gh-12607 --- lib/antora/extensions/inject-collector-config.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/antora/extensions/inject-collector-config.js b/lib/antora/extensions/inject-collector-config.js index 975bb23b25..1b939254ca 100644 --- a/lib/antora/extensions/inject-collector-config.js +++ b/lib/antora/extensions/inject-collector-config.js @@ -5,6 +5,13 @@ const JVM_ARGS='-Xmx3g -XX:+HeapDumpOnOutOfMemoryError' const REPO_URL = 'https://github.com/spring-projects/spring-security' const TASK_NAME=':spring-security-docs:generateAntora' +/** + * Set of tags that contain a collector config, but the antora command fails on GitHub Actions. + */ +const VERSIONS_TO_OVERRIDE = [ + '6.0.0-RC1' +] + /** * The purpose of this extension is to inject the Antora Collector configuration into the parsed component version * descriptor in tags created before Antora Collector was introduced. Antora Collector runs a command to generate a @@ -15,7 +22,13 @@ module.exports.register = function () { this.once('contentAggregated', ({ contentAggregate }) => { for (const { origins } of contentAggregate) { for (const origin of origins) { - if (!(origin.url === REPO_URL && origin.descriptor.ext?.collector === undefined)) continue + if (origin.url !== REPO_URL) { + continue + } + // Ignore tags with their own collector config unless the antora command fails on GitHub Actions + if (!(origin.descriptor.ext?.collector === undefined || VERSIONS_TO_OVERRIDE.includes(origin.tag))) { + continue + } origin.descriptor.ext = { collector: { run: { command: `${BASE_COMMAND} "-Dorg.gradle.jvmargs=${JVM_ARGS}" ${TASK_NAME}`, local: true },