From ae8853c6edce5a4d19fd4b74c4a4e653d0fb9db3 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Thu, 5 Jun 2025 16:59:53 +0200 Subject: [PATCH 1/2] CLOUDP-311380: update the foas release process to include `upcoming` API in `versions.json` --- .github/scripts/generate_changelog.sh | 4 +++- .github/scripts/split_spec.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/generate_changelog.sh b/.github/scripts/generate_changelog.sh index 87adeee782..fd866a9107 100755 --- a/.github/scripts/generate_changelog.sh +++ b/.github/scripts/generate_changelog.sh @@ -11,7 +11,9 @@ mkdir -p changelog/revision cp openapi/v2/openapi-*.json changelog/revision/ echo "Generating revision metadata file" -revision_version=$(< openapi/v2/versions.json jq -r '.[]' | paste -sd ',' - | sed "s/,preview//") +revision_version=$(< openapi/v2/versions.json jq -r ' + .[] | select(. != "preview" and (endswith(".upcoming") | not)) +' | paste -sd ',' -) 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 diff --git a/.github/scripts/split_spec.sh b/.github/scripts/split_spec.sh index 3f348be4b9..e541b20775 100755 --- a/.github/scripts/split_spec.sh +++ b/.github/scripts/split_spec.sh @@ -2,7 +2,7 @@ set -eou pipefail echo "Running FOAS CLI versions command" -foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable --stability-level preview +foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable --stability-level preview --stability-level upcoming echo "Running FOAS CLI split command with the following --env=${target_env:?} and -o=./openapi/v2/openapi.json" From 2991ffe61f9c0f1b9880e3facb1b414044a94746 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Thu, 5 Jun 2025 17:02:30 +0200 Subject: [PATCH 2/2] Update generate_changelog.sh --- .github/scripts/generate_changelog.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/generate_changelog.sh b/.github/scripts/generate_changelog.sh index fd866a9107..cdf808c7a6 100755 --- a/.github/scripts/generate_changelog.sh +++ b/.github/scripts/generate_changelog.sh @@ -11,6 +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 ',' -)