From 532e7587b8c44eb5166c2281327e522cef6210ef Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 18 Feb 2021 10:23:43 +0000 Subject: [PATCH] Correct the version input for changelog generation See gh-25107 --- ci/scripts/generate-changelog.sh | 2 +- ci/tasks/generate-changelog.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/scripts/generate-changelog.sh b/ci/scripts/generate-changelog.sh index 6873a4c0c7..49e96c1ff3 100755 --- a/ci/scripts/generate-changelog.sh +++ b/ci/scripts/generate-changelog.sh @@ -2,7 +2,7 @@ set -e CONFIG_DIR=git-repo/ci/config -version=$( cat version/version ) +version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' ) milestone=${version} if [[ $RELEASE_TYPE = "RELEASE" ]]; then diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml index 136106e70b..d7320a0cf8 100755 --- a/ci/tasks/generate-changelog.yml +++ b/ci/tasks/generate-changelog.yml @@ -7,7 +7,7 @@ image_resource: tag: '0.0.5' inputs: - name: git-repo -- name: version +- name: artifactory-repo outputs: - name: generated-changelog params: