From b7c067c214dad0f5193830ff4ebf9ed7f8476cfd Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 14 Jun 2024 11:17:53 -0400 Subject: [PATCH] ci: Remove dependency archives immediately after extraction This keeps the work directory cleaner while a CI job runs. --- .gitlab/ci/borland.ps1 | 1 + .gitlab/ci/clang.ps1 | 1 + .gitlab/ci/cmake.ps1 | 1 + .gitlab/ci/cmake.sh | 1 + .gitlab/ci/download_qt.cmake | 1 + .gitlab/ci/ispc.ps1 | 1 + .gitlab/ci/ispc.sh | 1 + .gitlab/ci/jom.ps1 | 1 + .gitlab/ci/msvc.ps1 | 1 + .gitlab/ci/ninja.ps1 | 1 + .gitlab/ci/ninja.sh | 1 + .gitlab/ci/openwatcom.ps1 | 1 + 12 files changed, 12 insertions(+) diff --git a/.gitlab/ci/borland.ps1 b/.gitlab/ci/borland.ps1 index 146a0471f3..c8daafda50 100644 --- a/.gitlab/ci/borland.ps1 +++ b/.gitlab/ci/borland.ps1 @@ -28,6 +28,7 @@ if ($hash.Hash -ne $sha256sum) { Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") Move-Item -Path "$outdir\$filename" -Destination "$outdir\bcc" +Remove-Item "$outdir\$tarball" $tools = "bcc32", "ilink32" foreach ($tool in $tools) { diff --git a/.gitlab/ci/clang.ps1 b/.gitlab/ci/clang.ps1 index e455ebc23b..204bff5f96 100644 --- a/.gitlab/ci/clang.ps1 +++ b/.gitlab/ci/clang.ps1 @@ -23,6 +23,7 @@ if ($hash.Hash -ne $sha256sum) { Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") Move-Item -Path "$outdir\$filename" -Destination "$outdir\llvm" +Remove-Item "$outdir\$tarball" $bin = "$outdir\llvm\bin" $lib = "$outdir\llvm\lib" diff --git a/.gitlab/ci/cmake.ps1 b/.gitlab/ci/cmake.ps1 index 63417ddf84..39adeb0344 100644 --- a/.gitlab/ci/cmake.ps1 +++ b/.gitlab/ci/cmake.ps1 @@ -27,3 +27,4 @@ if ($hash.Hash -ne $sha256sum) { Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") Move-Item -Path "$outdir\$filename" -Destination "$outdir\cmake" +Remove-Item "$outdir\$tarball" diff --git a/.gitlab/ci/cmake.sh b/.gitlab/ci/cmake.sh index 526c3384ea..77db8ed070 100755 --- a/.gitlab/ci/cmake.sh +++ b/.gitlab/ci/cmake.sh @@ -39,6 +39,7 @@ curl -OL "https://github.com/Kitware/CMake/releases/download/v$version/$tarball" $shatool --check cmake.sha256sum tar xf "$tarball" mv "$filename" cmake +rm "$tarball" cmake.sha256sum if [ "$( uname -s )" = "Darwin" ]; then ln -s CMake.app/Contents/bin cmake/bin diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 28a3e270b2..d2a00bdb04 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -122,6 +122,7 @@ foreach (qt_file IN LISTS qt_files) message(FATAL_ERROR "Failed to extract ${qt_file}: ${err}") endif () + file(REMOVE "${qt_file}") endforeach () # The Windows tarballs have some unfortunate permissions in them that prevent diff --git a/.gitlab/ci/ispc.ps1 b/.gitlab/ci/ispc.ps1 index 524896ffa0..d390061bbd 100644 --- a/.gitlab/ci/ispc.ps1 +++ b/.gitlab/ci/ispc.ps1 @@ -17,3 +17,4 @@ if ($hash.Hash -ne $sha256sum) { Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") Move-Item -Path "$outdir\$filename" -Destination "$outdir\ispc" +Remove-Item "$outdir\$tarball" diff --git a/.gitlab/ci/ispc.sh b/.gitlab/ci/ispc.sh index c1e379368c..7728c3250d 100755 --- a/.gitlab/ci/ispc.sh +++ b/.gitlab/ci/ispc.sh @@ -39,3 +39,4 @@ curl -OL "https://github.com/ispc/ispc/releases/download/v$version/$tarball" $shatool --check ispc.sha256sum tar xf "$tarball" mv "$filename" ispc +rm "$tarball" ispc.sha256sum diff --git a/.gitlab/ci/jom.ps1 b/.gitlab/ci/jom.ps1 index 6c28005f66..430d3232bf 100644 --- a/.gitlab/ci/jom.ps1 +++ b/.gitlab/ci/jom.ps1 @@ -13,3 +13,4 @@ if ($hash.Hash -ne $sha256sum) { } Expand-Archive -Path "$outdir\$tarball" -DestinationPath "$outdir\jom" +Remove-Item "$outdir\$tarball" diff --git a/.gitlab/ci/msvc.ps1 b/.gitlab/ci/msvc.ps1 index e8388a4796..a6b6fbf532 100644 --- a/.gitlab/ci/msvc.ps1 +++ b/.gitlab/ci/msvc.ps1 @@ -23,6 +23,7 @@ if ($hash.Hash -ne $sha256sum) { Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") Move-Item -Path "$outdir\$filename" -Destination "$outdir\msvc" +Remove-Item "$outdir\$tarball" $bat = Get-Content -path "$outdir\msvc\$vcvars.in" -Raw $bat = $bat -replace "@VS_ROOT@","$outdir\msvc" diff --git a/.gitlab/ci/ninja.ps1 b/.gitlab/ci/ninja.ps1 index 0af3b4fdcc..4c4d675190 100644 --- a/.gitlab/ci/ninja.ps1 +++ b/.gitlab/ci/ninja.ps1 @@ -21,3 +21,4 @@ if ($hash.Hash -ne $sha256sum) { Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") +Remove-Item "$outdir\$tarball" diff --git a/.gitlab/ci/ninja.sh b/.gitlab/ci/ninja.sh index ce39b462fc..753596b86d 100755 --- a/.gitlab/ci/ninja.sh +++ b/.gitlab/ci/ninja.sh @@ -43,3 +43,4 @@ echo "$sha256sum $tarball" > ninja.sha256sum curl -OL "$baseurl/$tarball" $shatool --check ninja.sha256sum ./cmake/bin/cmake -E tar xf "$tarball" +rm "$tarball" ninja.sha256sum diff --git a/.gitlab/ci/openwatcom.ps1 b/.gitlab/ci/openwatcom.ps1 index 4f1012cc8f..eb617c3379 100644 --- a/.gitlab/ci/openwatcom.ps1 +++ b/.gitlab/ci/openwatcom.ps1 @@ -23,3 +23,4 @@ if ($hash.Hash -ne $sha256sum) { Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") Move-Item -Path "$outdir\$filename" -Destination "$outdir\watcom" +Remove-Item "$outdir\$tarball"