From ded6bfbdb3ed675881d7586c480d399087d958f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pl=C3=ADnio=20Larrubia?= Date: Thu, 29 Aug 2024 14:28:26 -0300 Subject: [PATCH] ci: enable cmake cache on all platforms (SDL/Qt) - uses actions/cache@v4 and hendrikmuhs/ccache-action@v1.2.14 - Keeps the cache from CMake Cache configuration (Windows, Linux, macOS) - Keeps the cache from CMake build objects (only Linux works) ci: remove duplicated cache (Windows/Mac) - Remove "qt" cache from macos.yml ci: remove duplicated cache from macos-qt.yml - Rename step on macos.yml ci: revert cp -R and copy -R commands to mv and move respectively (Windows/macOS) - Will decrease cache file size and speed up a little the build steps ci: update cache name with OS-qt/sdl as a prefix - This will invalidate all the other existing caches ci: use the append-timestamp as false for linux/-qt - Existing ccache caches will invalidate, but will produce once ci: add hashes to the ccache keys - Will invalidate caches once again, but I swear this is the last time --- .github/workflows/linux-qt.yml | 21 ++++++++++++++++++++- .github/workflows/linux.yml | 23 +++++++++++++++++++++-- .github/workflows/macos-qt.yml | 13 ++++++++++++- .github/workflows/macos.yml | 13 ++++++++++++- .github/workflows/windows-qt.yml | 13 ++++++++++++- .github/workflows/windows.yml | 13 ++++++++++++- 6 files changed, 89 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-qt.yml b/.github/workflows/linux-qt.yml index 26b80d68..12b323c3 100644 --- a/.github/workflows/linux-qt.yml +++ b/.github/workflows/linux-qt.yml @@ -25,8 +25,27 @@ jobs: run: > sudo apt-get update && sudo apt install libx11-dev libxext-dev libwayland-dev libfuse2 clang build-essential qt6-base-dev qt6-tools-dev + - name: Cache CMake dependency source code + uses: actions/cache@v4 + env: + cache-name: ${{ runner.os }}-qt-cache-cmake-dependency-sources + with: + path: | + ${{github.workspace}}/build + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + restore-keys: | + ${{ env.cache-name }}- + + - name: Cache CMake dependency build objects + uses: hendrikmuhs/ccache-action@v1.2.14 + env: + cache-name: ${{ runner.os }}-qt-cache-cmake-dependency-builds + with: + append-timestamp: false + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_QT_GUI=ON + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_QT_GUI=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ef77a16c..b99c59e5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,8 +25,27 @@ jobs: run: > sudo apt-get update && sudo apt install libx11-dev libxext-dev libwayland-dev libfuse2 clang build-essential + - name: Cache CMake dependency source code + uses: actions/cache@v4 + env: + cache-name: ${{ runner.os }}-sdl-cache-cmake-dependency-sources + with: + path: | + ${{github.workspace}}/build + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + restore-keys: | + ${{ env.cache-name }}- + + - name: Cache CMake dependency build objects + uses: hendrikmuhs/ccache-action@v1.2.14 + env: + cache-name: ${{ runner.os }}-sdl-cache-cmake-dependency-builds + with: + append-timestamp: false + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel @@ -45,4 +64,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: shadps4-sdl-appimage - path: Shadps4-sdl.AppImage + path: Shadps4-sdl.AppImage \ No newline at end of file diff --git a/.github/workflows/macos-qt.yml b/.github/workflows/macos-qt.yml index def98ea3..3d744e1c 100644 --- a/.github/workflows/macos-qt.yml +++ b/.github/workflows/macos-qt.yml @@ -40,6 +40,17 @@ jobs: arch: clang_64 archives: qtbase qttools + - name: Cache CMake dependency source code + uses: actions/cache@v4 + env: + cache-name: ${{ runner.os }}-qt-cache-cmake-dependency-sources + with: + path: | + ${{github.workspace}}/build + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + restore-keys: | + ${{ env.cache-name }}- + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES=x86_64 -DENABLE_QT_GUI=ON @@ -58,4 +69,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: shadps4-macos-qt - path: shadps4-macos-qt.tar.gz + path: shadps4-macos-qt.tar.gz \ No newline at end of file diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1a2a6eff..a31f2258 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -31,6 +31,17 @@ jobs: arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" arch -x86_64 /usr/local/bin/brew install molten-vk + - name: Cache CMake dependency source code + uses: actions/cache@v4 + env: + cache-name: ${{ runner.os }}-sdl-cache-cmake-dependency-sources + with: + path: | + ${{github.workspace}}/build + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + restore-keys: | + ${{ env.cache-name }}- + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES=x86_64 @@ -49,4 +60,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: shadps4-macos-sdl - path: shadps4-macos-sdl.tar.gz + path: shadps4-macos-sdl.tar.gz \ No newline at end of file diff --git a/.github/workflows/windows-qt.yml b/.github/workflows/windows-qt.yml index 70c33ebe..f8019a72 100644 --- a/.github/workflows/windows-qt.yml +++ b/.github/workflows/windows-qt.yml @@ -30,6 +30,17 @@ jobs: arch: win64_msvc2019_64 archives: qtbase qttools + - name: Cache CMake dependency source code + uses: actions/cache@v4 + env: + cache-name: ${{ runner.os }}-qt-cache-cmake-dependency-sources + with: + path: | + ${{github.workspace}}/build + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + restore-keys: | + ${{ env.cache-name }}- + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T ClangCL -DENABLE_QT_GUI=ON @@ -47,4 +58,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: shadps4-win64-qt - path: upload + path: upload \ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 49912486..23f37640 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,6 +20,17 @@ jobs: with: submodules: recursive + - name: Cache CMake dependency source code + uses: actions/cache@v4 + env: + cache-name: ${{ runner.os }}-sdl-cache-cmake-dependency-sources + with: + path: | + ${{github.workspace}}/build + key: ${{ env.cache-name }}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }} + restore-keys: | + ${{ env.cache-name }}- + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T ClangCL @@ -31,4 +42,4 @@ jobs: with: name: shadps4-win64-sdl path: | - ${{github.workspace}}/build/Release/shadPS4.exe + ${{github.workspace}}/build/Release/shadPS4.exe \ No newline at end of file