From 2ba7d745754894df469bf02e6bb335ab010549ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Tue, 7 May 2024 16:19:32 +0200 Subject: [PATCH] Use 7zip for cleanup action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- .github/actions/e2e_cleanup_timeframe/action.yml | 4 ++-- .github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/e2e_cleanup_timeframe/action.yml b/.github/actions/e2e_cleanup_timeframe/action.yml index e5f030287..869148705 100644 --- a/.github/actions/e2e_cleanup_timeframe/action.yml +++ b/.github/actions/e2e_cleanup_timeframe/action.yml @@ -31,11 +31,11 @@ runs: with: service_account: "destroy-e2e@constellation-e2e.iam.gserviceaccount.com" - - name: Install unzip + - name: Install 7zip uses: ./.github/actions/setup_bazel_nix with: nixTools: | - unzip + _7zz - name: Run cleanup run: ./.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh shell: bash diff --git a/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh b/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh index 0da75f25b..4c7672018 100755 --- a/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh +++ b/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh @@ -76,7 +76,7 @@ for directory in ./terraform-state-*; do echo " extracting $directory" # extract and decrypt the artifact - unzip -d "${directory}" -P "$artifact_pwd" "$directory/archive.zip" > /dev/null || exit 1 + 7zz x -t7z -p"${artifact_pwd}" -o"${directory}" "${directory}/archive.7z" > /dev/null || exit 1 done # create terraform caching directory