From 7b427c451ff5745b098f6a976a660e37d17775ba Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:17:47 +0000 Subject: [PATCH 1/3] Reduce cache size --- .github/workflows/ci.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b75a1be7..94413e760 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -441,7 +441,11 @@ jobs: fi cd ../ rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".") - cd ../ + cd ./llvm/ + rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + cd ../clang/ + rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + cd ../.. - name: Build LLVM/Cling on Windows systems if the cache is invalid if: ${{ runner.os == 'windows' && steps.cache.outputs.cache-hit != 'true' }} @@ -520,7 +524,11 @@ jobs: } cd ..\ rm -r -force $(find.exe . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".") - cd ..\ + cd .\llvm\ + rm -r -force $(find.exe . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + cd ..\clang\ + rm -r -force $(find.exe . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + cd ..\.. - name: Save Cache LLVM/Clang runtime build directory uses: actions/cache/save@v4 From 93fec54c4fa69ea660edc2e198cafa4b532b93dc Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:24:27 +0000 Subject: [PATCH 2/3] Keep cmake folder cache windows --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94413e760..3c7c9da6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -525,9 +525,9 @@ jobs: cd ..\ rm -r -force $(find.exe . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".") cd .\llvm\ - rm -r -force $(find.exe . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + rm -r -force $(find.exe . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".") cd ..\clang\ - rm -r -force $(find.exe . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + rm -r -force $(find.exe . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".") cd ..\.. - name: Save Cache LLVM/Clang runtime build directory From 4881025ef288bca339cfe64408810e6b6bb53e32 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:32:00 +0000 Subject: [PATCH 3/3] Add back cmake to Unix llvm cache --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c7c9da6e..56f55f094 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -442,9 +442,9 @@ jobs: cd ../ rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".") cd ./llvm/ - rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".") cd ../clang/ - rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name ".") + rm -rf $(find . -maxdepth 1 ! -name "include" ! -name "lib" ! -name "cmake" ! -name ".") cd ../.. - name: Build LLVM/Cling on Windows systems if the cache is invalid