From d0e1ea7010387f2ec39d4dca9539a1f8f39f598e Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 01:16:16 -0400 Subject: [PATCH] GHA: fix error in the cleanup script --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index c70f9ebc9..2ee151008 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -130,13 +130,13 @@ jobs: aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" echo "Uploading new win zip and self extracting jar files to s3..." aws s3 mv . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" --acl public-read --no-progress - - name: cleanup + - name: Cleanup if: ${{ always() }} env: SSH_KEY: ~/.ssh/id_rsa SSH_USER: signer run: | - ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm -rf /opt/bamboo/$id + ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm -rf /opt/bamboo/${{ github.run_id }} rm -rf *spring-tool-suite-4*win* sign-osx-distros: @@ -218,7 +218,7 @@ jobs: aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" echo "Uploading new dmg files to s3..." aws s3 mv . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --acl public-read --no-progress - - name: cleanup + - name: Cleanup if: ${{ always() }} run: | rm -rf *spring-tool-suite-4*macosx*