jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-25 16:13:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI: Adjustments to ccache usage (#6703)

Browse source 
* Increase ccache size

* Fix Arch ccache usage

* more cleanup

* harmonize names
This commit is contained in:
tooomm 2026-03-15 17:41:17 +01:00 • committed by GitHub
parent ce652de272
commit cf01dc770b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.github/workflows/desktop-build.yml vendored
View file

@ -153,10 +153,10 @@ jobs:
continue-on-error: ${{matrix.allow-failure == 'yes'}} continue-on-error: ${{matrix.allow-failure == 'yes'}}
env: env:
NAME: ${{matrix.distro}}${{matrix.version}} NAME: ${{matrix.distro}}${{matrix.version}}
CACHE: ${{github.workspace}}/.cache/${{matrix.distro}}${{matrix.version}} # directory for caching docker image and ccache CACHE_DIR: ${{github.workspace}}/.cache/${{matrix.distro}}${{matrix.version}} # directory for caching docker image and ccache
# Cache size over the entire repo is 10Gi: # Cache size over the entire repo is 10Gi:
# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
CCACHE_SIZE: 500M CCACHE_SIZE: 550M
CMAKE_GENERATOR: 'Ninja' CMAKE_GENERATOR: 'Ninja'
steps: steps:
@ -169,7 +169,7 @@ jobs:
env: env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
with: with:
path: ${{env.CACHE}} path: ${{env.CACHE_DIR}}
key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}} key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}}
restore-keys: ccache-${{matrix.distro}}${{matrix.version}}- restore-keys: ccache-${{matrix.distro}}${{matrix.version}}-
@ -202,18 +202,18 @@ jobs:
--ccache "$CCACHE_SIZE" $NO_CLIENT --ccache "$CCACHE_SIZE" $NO_CLIENT
.ci/name_build.sh .ci/name_build.sh
# Delete used cache to emulate a cache update. See https://github.com/actions/cache/issues/342. # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342.
- name: Delete old compiler cache (ccache) - name: Delete remote compiler cache (ccache)
if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit && steps.build.outcome == 'success' if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}
run: gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }} run: gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}
- name: Save compiler cache (ccache) - name: Save updated compiler cache (ccache)
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
uses: actions/cache/save@v5 uses: actions/cache/save@v5
with: with:
path: ${{env.CACHE}} path: ${{env.CACHE_DIR}}
key: ${{ steps.ccache_restore.outputs.cache-primary-key }} key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
- name: Upload artifact - name: Upload artifact
@ -330,7 +330,7 @@ jobs:
CCACHE_DIR: ${{github.workspace}}/.cache/ CCACHE_DIR: ${{github.workspace}}/.cache/
# Cache size over the entire repo is 10Gi: # Cache size over the entire repo is 10Gi:
# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
CCACHE_SIZE: 500M CCACHE_SIZE: 550M
steps: steps:
- name: Checkout - name: Checkout
@ -445,21 +445,19 @@ jobs:
TARGET_MACOS_VERSION: ${{ matrix.override_target }} TARGET_MACOS_VERSION: ${{ matrix.override_target }}
run: .ci/compile.sh --server --test --vcpkg run: .ci/compile.sh --server --test --vcpkg
# Delete used cache to emulate a cache update. See https://github.com/actions/cache/issues/342. # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342.
- name: Delete old compiler cache (ccache) - name: Delete remote compiler cache (ccache)
if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1 && steps.ccache_restore.outputs.cache-hit && steps.build.outcome == 'success' if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1 && steps.ccache_restore.outputs.cache-hit
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}
run: gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }} run: gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}
- name: Save compiler cache (ccache) - name: Save updated compiler cache (ccache)
if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1 if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
uses: actions/cache/save@v5 uses: actions/cache/save@v5
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
with: with:
path: ${{env.CCACHE_DIR}} path: ${{env.CCACHE_DIR}}
key: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-${{env.BRANCH_NAME}} key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
- name: Sign app bundle - name: Sign app bundle
if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null