From 37bb4f30fdc62c3a4a240f698907abca5ca1aa44 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Sun, 8 Jun 2025 17:01:45 -0400 Subject: [PATCH] CI: Remove CMake caching. Seems like the build root can change and CMake rightfully gets confused at the conflicting paths, so let's just use the minutes to do this from scratch. --- .github/workflows/ci.yml | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c21fd943..ef4acc96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,20 +61,9 @@ jobs: if: steps.cache-brew.outputs.cache-hit != 'true' run: brew install ninja sdl2 - - name: Cache CMake build folder - id: cache-cmake-build - uses: actions/cache@v3 - with: - path: ${{ env.SRC_DIR_PATH }}/build - key: ${{ runner.os }}-${{ env.container_image_tag }}-cmake-build-${{ hashFiles(format('{0}/CMakeLists.txt', env.SRC_DIR_PATH)) }} - # Using a more specific key including a reference to the container if possible - # We need to define container_image_tag in the env or find a way to get it - - name: CMake configure (default version) run: | mkdir -p ${SRC_DIR_PATH}/build && cd ${SRC_DIR_PATH}/build - # If cache was hit and build dir exists, this cmake might just verify. - # If build dir is empty, it will configure. cmake -G Ninja .. - name: Build (default version) run: ninja -C ${SRC_DIR_PATH}/build @@ -107,19 +96,9 @@ jobs: with: submodules: true - - name: Cache CMake build folder - id: cache-cmake-build - uses: actions/cache@v3 - with: - path: ${{ env.SRC_DIR_PATH }}/build - key: ${{ runner.os }}-${{ env.CONTAINER_IMAGE_TAG }}-cmake-build-${{ hashFiles(format('{0}/CMakeLists.txt', env.SRC_DIR_PATH)) }} - # Using a more specific key including a reference to the container - - name: CMake configure (default version) run: | mkdir -p ${SRC_DIR_PATH}/build && cd ${SRC_DIR_PATH}/build - # If cache was hit and build dir exists, this cmake might just verify. - # If build dir is empty, it will configure. cmake -G Ninja .. - name: Build (default version) run: ninja -C ${SRC_DIR_PATH}/build @@ -166,19 +145,7 @@ jobs: Invoke-WebRequest "https://github.com/libsdl-org/SDL/releases/download/release-$env:SDL_VERSION/SDL2-devel-$env:SDL_VERSION-VC.zip" -OutFile C:\SDL.zip Expand-Archive C:\SDL.zip -DestinationPath C:\ - - name: Cache build folder for this CMakeLists.txt - id: cache-windows-build-folder - uses: actions/cache@v3 - env: - cache-name: cache-windows-build-folder-VS2022 - with: - path: | - desktop_version/build - desktop_version/CMakeLists.txt - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('desktop_version/CMakeLists.txt') }}-SDL${{ env.SDL_VERSION }} - - - if: ${{ steps.cache-windows-build-folder.outputs.cache-hit != 'true' }} - name: CMake initial configure/generate + - name: CMake initial configure/generate run: | mkdir $env:SRC_DIR_PATH/build cd $env:SRC_DIR_PATH/build