From b5174b4b9065f8dc1594ed70d00c2da1b5f9d88e Mon Sep 17 00:00:00 2001 From: Holden Date: Tue, 7 Jan 2025 10:01:43 -0500 Subject: [PATCH] CI: Update Cache Action --- .github/actions/qt-android/action.yml | 9 ++++----- .github/workflows/custom.yml | 5 ++--- .github/workflows/ios.yml | 5 ++--- .github/workflows/linux.yml | 5 ++--- .github/workflows/macos.yml | 5 ++--- .github/workflows/windows.yml | 5 ++--- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.github/actions/qt-android/action.yml b/.github/actions/qt-android/action.yml index 9bc90bf3325..e406eaca88e 100644 --- a/.github/actions/qt-android/action.yml +++ b/.github/actions/qt-android/action.yml @@ -27,8 +27,8 @@ runs: - name: Setup Android Environment uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 11076708 - packages: 'platform-tools platforms;android-34 build-tools;34.0.0' # ndk;25.1.8937393' + cmdline-tools-version: 12266719 + packages: 'platform-tools platforms;android-35 build-tools;35.0.0' # ndk;25.1.8937393' log-accepted-android-sdk-licenses: false - name: Install Android NDK @@ -50,14 +50,13 @@ runs: shell: bash - name: Set Up Cache - uses: hendrikmuhs/ccache-action@v1.2 + uses: hendrikmuhs/ccache-action@main with: create-symlink: ${{ runner.os != 'Windows' }} key: ${{ runner.os }}-Android-${{ matrix.BuildType }} - restore-keys: ${{ runner.os }}-Android-${{ matrix.BuildType }} max-size: 1G - append-timestamp: false save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + evict-old-files: 'job' - name: Install Qt for ${{ runner.os }} uses: jurplel/install-qt-action@v4 diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml index 52988b11a04..7648fda89d8 100644 --- a/.github/workflows/custom.yml +++ b/.github/workflows/custom.yml @@ -78,14 +78,13 @@ jobs: # uses: mozilla-actions/sccache-action@v0.0.5 - name: Set Up Cache - uses: hendrikmuhs/ccache-action@v1.2 + uses: hendrikmuhs/ccache-action@main with: key: ${{ runner.os }}-${{ matrix.Arch }}-${{ matrix.BuildType }} - restore-keys: ${{ runner.os }}-${{ matrix.Arch }}-${{ matrix.BuildType }} max-size: 1G - append-timestamp: false variant: sccache save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + evict-old-files: 'job' - name: Install Qt for Windows (x64) if: matrix.Arch == 'x64' diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index ddb19719d75..105b67b03de 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -58,13 +58,12 @@ jobs: - uses: lukka/get-cmake@latest - name: Set Up Cache - uses: hendrikmuhs/ccache-action@v1.2 + uses: hendrikmuhs/ccache-action@main with: key: ${{ runner.os }}-iOS-${{ matrix.BuildType }} - restore-keys: ${{ runner.os }}-iOS-${{ matrix.BuildType }} max-size: 1G - append-timestamp: false save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + evict-old-files: 'job' - name: Install Qt for MacOS uses: jurplel/install-qt-action@v4 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 61b210a52db..e67a558f323 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -80,14 +80,13 @@ jobs: sudo make install - name: Set Up Cache - uses: hendrikmuhs/ccache-action@v1.2 + uses: hendrikmuhs/ccache-action@main with: create-symlink: true key: ${{ runner.os }}-${{ matrix.BuildType }} - restore-keys: ${{ runner.os }}-${{ matrix.BuildType }} max-size: 1G - append-timestamp: false save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + evict-old-files: 'job' - name: Install Qt for Linux uses: jurplel/install-qt-action@v4 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 146ddfdde5d..0bbdbc48d25 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -70,13 +70,12 @@ jobs: echo "PKG_CONFIG_PATH=/Library/Frameworks/GStreamer.framework/lib/pkgconfig:/Library/Frameworks/GStreamer.framework/lib/gstreamer-1.0/pkgconfig:${{ env.PKG_CONFIG_PATH }}" >> "$GITHUB_ENV" - name: Set Up Cache - uses: hendrikmuhs/ccache-action@v1.2 + uses: hendrikmuhs/ccache-action@main with: key: ${{ runner.os }}-${{ matrix.BuildType }} - restore-keys: ${{ runner.os }}-${{ matrix.BuildType }} max-size: 1G - append-timestamp: false save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + evict-old-files: 'job' - name: Install Qt uses: jurplel/install-qt-action@v4 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 156f1687c16..cf65995557b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -71,14 +71,13 @@ jobs: # uses: mozilla-actions/sccache-action@v0.0.5 - name: Set Up Cache - uses: hendrikmuhs/ccache-action@v1.2 + uses: hendrikmuhs/ccache-action@main with: key: ${{ runner.os }}-${{ matrix.Arch }}-${{ matrix.BuildType }} - restore-keys: ${{ runner.os }}-${{ matrix.Arch }}-${{ matrix.BuildType }} max-size: 1G - append-timestamp: false variant: sccache save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + evict-old-files: 'job' - name: Install Qt for Windows (x64) if: matrix.Arch == 'x64'