Merge branch '2.4.x'

See gh-25344
2021-02-18 10:26:24 +00:00
parent 7bf2898664 04b2f56a4d
commit b702130ee3
2 changed files with 2 additions and 2 deletions
--- 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/' )

 java -jar /github-changelog-generator.jar \
  --spring.config.location=${CONFIG_DIR}/changelog-generator.yml \
--- 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: