From 6602351ccccb574ee586276dfcc5da837d9daef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Tue, 7 May 2024 08:32:40 +0200 Subject: [PATCH] Dont fail if folder to remove does not exist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- .github/actions/constellation_create/action.yml | 2 +- .github/actions/upload_terraform_module/action.yml | 2 +- .github/workflows/e2e-upgrade.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml index 7e149fc18..9aed0ac58 100644 --- a/.github/actions/constellation_create/action.yml +++ b/.github/actions/constellation_create/action.yml @@ -262,7 +262,7 @@ runs: mkdir to-zip cp -r constellation-terraform to-zip cp -r constellation-iam-terraform to-zip - rm to-zip/constellation-terraform/plan.zip + rm -f to-zip/constellation-terraform/plan.zip rm -rf to-zip/constellation-terraform/.terraform to-zip/constellation-iam-terraform/.terraform - name: Upload terraform state diff --git a/.github/actions/upload_terraform_module/action.yml b/.github/actions/upload_terraform_module/action.yml index 2a40a322a..becd22c2b 100644 --- a/.github/actions/upload_terraform_module/action.yml +++ b/.github/actions/upload_terraform_module/action.yml @@ -23,4 +23,4 @@ runs: - name: Cleanup Terraform module dir shell: bash run: | - rm -r terraform-module terraform-module.zip + rm -f terraform-module terraform-module.zip diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml index 31ac0e1b8..462d113a3 100644 --- a/.github/workflows/e2e-upgrade.yml +++ b/.github/workflows/e2e-upgrade.yml @@ -513,7 +513,7 @@ jobs: run: | mkdir -p to-zip cp -r constellation-terraform to-zip - rm to-zip/constellation-terraform/plan.zip + rm -f to-zip/constellation-terraform/plan.zip rm -rf to-zip/constellation-terraform/.terraform cp -r constellation-iam-terraform to-zip rm -rf to-zip/constellation-iam-terraform/.terraform @@ -542,7 +542,7 @@ jobs: GH_TOKEN: ${{ github.token }} uses: ./.github/actions/update_tfstate with: - name: terraform-state-${{ needs.create-cluster.outputs.e2e-name-prefix }} + name: terraform-state-${{ needs.create-cluster.outputs.e2e-name-prefix }} runID: ${{ github.run_id }} encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}