From e2957b46bbca291c9b87747df9e3f947847dda87 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Mon, 9 Jun 2025 13:00:25 +0200 Subject: [PATCH 1/2] CLOUDP-311382: Enable `upcoming` for changelog --- .github/scripts/generate_changelog.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/scripts/generate_changelog.sh b/.github/scripts/generate_changelog.sh index cdf808c7a6..94cef8c653 100755 --- a/.github/scripts/generate_changelog.sh +++ b/.github/scripts/generate_changelog.sh @@ -11,11 +11,8 @@ mkdir -p changelog/revision cp openapi/v2/openapi-*.json changelog/revision/ echo "Generating revision metadata file" -# CLOUDP-311382: This change avoid to conside upcoming for the changelog for now. # We will revert this change once we add support for upcoming to changelog. -revision_version=$(< openapi/v2/versions.json jq -r ' - .[] | select(. != "preview" and (endswith(".upcoming") | not)) -' | paste -sd ',' -) +revision_version=$(< openapi/v2/versions.json jq -r '.[]' | paste -sd ',' - | sed "s/,preview//") RELEASE_SHA=$(< foas-metadata.json jq -r '.services[] | select(.name=="mms") | .sha') foascli changelog metadata create --sha "${RELEASE_SHA}" --versions="${revision_version}" > changelog/revision/metadata.json cat changelog/revision/metadata.json From 131f42c4af496833c1cdae4e95bb77a2ca02f126 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Mon, 9 Jun 2025 13:19:36 +0200 Subject: [PATCH 2/2] Update changelog.go --- tools/cli/internal/changelog/changelog.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cli/internal/changelog/changelog.go b/tools/cli/internal/changelog/changelog.go index ff143d3e54..7c76442191 100644 --- a/tools/cli/internal/changelog/changelog.go +++ b/tools/cli/internal/changelog/changelog.go @@ -442,7 +442,8 @@ func latestVersionActiveOnDate(date string, versions []string) (string, error) { activeVersions := []time.Time{} for _, version := range versions { - if apiversion.IsPreviewStabilityLevel(version) { + // Only stable API can be the Active Version + if apiversion.IsPreviewStabilityLevel(version) || apiversion.IsUpcomingStabilityLevel(version) { continue } versionTime, err := newDateFromString(version)