From d647f97ec17013c475addb01a7e2e1d26a28825f Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Tue, 20 Jun 2023 20:44:11 +0200 Subject: [PATCH] [CI] Do NOT use PATH as a variable. :facepalm: --- .github/workflows/common.yml | 4 +--- set-doc-properties.sh | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 0a9c9b01..c5e928e7 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -699,9 +699,7 @@ jobs: echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV - name: Set Stream Applications Docs Properties for ${{ needs.parameters.outputs.release_train_version }} run: | - source ./set-doc-properties.sh "${{ needs.parameters.outputs.release_train_version }}" - jfrog rt set-props --server-id repo.spring.io "$PATH" "$PROPS" - echo "Setting [$PROPS] on [$PATH]" + ./set-doc-properties.sh "${{ needs.parameters.outputs.release_train_version }}" echo "::notice ::stream-applications-release-train build completed" - name: 'Upload: Test Reports' if: ${{ always() }} diff --git a/set-doc-properties.sh b/set-doc-properties.sh index 05710b32..cf94422e 100755 --- a/set-doc-properties.sh +++ b/set-doc-properties.sh @@ -20,10 +20,10 @@ if [[ "$VERSION" = *"-SNAPSHOT"* ]]; then curl -o maven-metadata.xml -s $META_DATA DL_TS=$(xmllint --xpath "/metadata/versioning/snapshot/timestamp/text()" maven-metadata.xml | sed 's/\.//') DL_VERSION=$(xmllint --xpath "/metadata/versioning/snapshotVersions/snapshotVersion[extension/text() = 'pom' and updated/text() = '$DL_TS']/value/text()" maven-metadata.xml) - PATH=${REL_TYPE}/org/springframework/cloud/stream/app/stream-applications-docs/${VERSION}/stream-applications-docs-${DL_VERSION}.zip + PROP_PATH=${REL_TYPE}/org/springframework/cloud/stream/app/stream-applications-docs/${VERSION}/stream-applications-docs-${DL_VERSION}.zip else - PATH=${REL_TYPE}/org/springframework/cloud/stream/app/stream-applications-docs/${VERSION}/stream-applications-docs-${VERSION}.zip + PROP_PATH=${REL_TYPE}/org/springframework/cloud/stream/app/stream-applications-docs/${VERSION}/stream-applications-docs-${VERSION}.zip fi PROPS="zip.deployed=false;zip.type=docs;zip.name=stream-applications;zip.displayname=Stream Applications" -export PATH -export PROPS +echo "Setting $PROPS on $PROP_PATH" +jfrog rt set-props --server-id repo.spring.io "$PROP_PATH" "$PROPS"