From 34d3fbcba780a67e90609c1c922c3eb99e932943 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Wed, 12 Jun 2024 21:02:24 -0400 Subject: [PATCH 1/2] [CI] Cleanup of adjust-pages.pl script --- scripts/content-modules/adjust-pages.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index f5df542d6a2d..d77160f3d5a8 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -130,10 +130,9 @@ () # Fix links that are to the title of the .md page # TODO: fix these in the spec - s|(/context/api-propagators.md)#propagators-api|$1|g; - s|(/semantic_conventions/faas.md)#function-as-a-service|$1|g; - s|(/resource/sdk.md)#resource-sdk|$1|g; - s|(event-api.md#)(data-model)|$1event-$2|g; + s|(/context/api-propagators.md)#propagators-api|$1|g; # Waiting on https://github.com/open-telemetry/opentelemetry-specification/pull/4080 + s|(/resource/sdk.md)#resource-sdk|$1|g; # Waiting on https://github.com/open-telemetry/semantic-conventions/pull/1154 + s|(event-api.md#)(data-model)|$1event-$2|g; # Waiting on https://github.com/open-telemetry/opentelemetry-specification/pull/4075 s|\.\.\/README.md\b|$otelSpecRepoUrl/|g if $ARGV =~ /specification._index/; s|\.\.\/README.md\b|..| if $ARGV =~ /specification.library-guidelines.md/; From 20dd993b11ff496fcd3be10697ac830f7db99030 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Thu, 13 Jun 2024 08:48:34 -0400 Subject: [PATCH 2/2] Actually codify the TODO drop condition --- scripts/content-modules/adjust-pages.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index d77160f3d5a8..05404907a7c8 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -130,9 +130,12 @@ () # Fix links that are to the title of the .md page # TODO: fix these in the spec - s|(/context/api-propagators.md)#propagators-api|$1|g; # Waiting on https://github.com/open-telemetry/opentelemetry-specification/pull/4080 - s|(/resource/sdk.md)#resource-sdk|$1|g; # Waiting on https://github.com/open-telemetry/semantic-conventions/pull/1154 - s|(event-api.md#)(data-model)|$1event-$2|g; # Waiting on https://github.com/open-telemetry/opentelemetry-specification/pull/4075 + s|(/context/api-propagators.md)#propagators-api|$1|g + if $otelSpecVers le '1.34.0'; # Ensure that https://github.com/open-telemetry/opentelemetry-specification/pull/4080 is in the new release + s|(/resource/sdk.md)#resource-sdk|$1|g + if $semconvVers le '1.26.0'; # Ensure that https://github.com/open-telemetry/semantic-conventions/pull/1154 is in the new release + s|(event-api.md#)(data-model)|$1event-$2|g + if $otelSpecVers le '1.34.0'; # Ensure that https://github.com/open-telemetry/opentelemetry-specification/pull/4075 is in the new release s|\.\.\/README.md\b|$otelSpecRepoUrl/|g if $ARGV =~ /specification._index/; s|\.\.\/README.md\b|..| if $ARGV =~ /specification.library-guidelines.md/;