diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index cd0c2fbad..0dcea84f6 100644 --- a/.github/workflows/ansible.yml +++ b/.github/workflows/ansible.yml @@ -44,7 +44,9 @@ jobs: ARTIFACTORY_GENERIC_RELEASE_URL: ${{ secrets.ARTIFACTORY_GENERIC_RELEASE_URL }} ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }} run: | - $GITHUB_WORKSPACE/build/bin/artifactory-release.sh $GITHUB_WORKSPACE/ibm/mas_devops/ibm-mas_devops-${{ env.VERSION }}.tar.gz + echo "Copying $GITHUB_WORKSPACE/ibm/mas_devops/ibm-mas_devops-${{ env.VERSION }}.tar.gz to $GITHUB_WORKSPACE/ibm/mas_devops/ibm-mas_devops.tar.gz..." + cp $GITHUB_WORKSPACE/ibm/mas_devops/ibm-mas_devops-${{ env.VERSION }}.tar.gz $GITHUB_WORKSPACE/ibm/mas_devops/ibm-mas_devops.tar.gz + $GITHUB_WORKSPACE/build/bin/artifactory-release.sh $GITHUB_WORKSPACE/ibm/mas_devops/ibm-mas_devops.tar.gz - name: Perform dependency check uses: dependency-check/Dependency-Check_Action@main diff --git a/build/bin/artifactory-release.sh b/build/bin/artifactory-release.sh index 79339369f..7df170fa9 100644 --- a/build/bin/artifactory-release.sh +++ b/build/bin/artifactory-release.sh @@ -32,7 +32,7 @@ if [ ! -e $FILE_PATH ]; then exit 1 fi -TARGET_URL="${ARTIFACTORY_GENERIC_RELEASE_URL}/${GITHUB_REPOSITORY}/${FILE_NAME}.${FILE_EXT}" +TARGET_URL="${ARTIFACTORY_GENERIC_RELEASE_URL}/${GITHUB_REPOSITORY}/${VERSION}/${FILE_NAME}-${VERSION}.${FILE_EXT}" artifactory_upload $FILE_PATH $TARGET_URL # Update latest when we publish release, and when we update master branch .. latest build is used internally in development