git: More ccache fixes for Snap and RPM

This commit is contained in:
WerWolv
2025-07-24 12:35:16 +02:00
parent e5e867db22
commit 4c8c383378
2 changed files with 4 additions and 9 deletions

View File

@@ -1045,7 +1045,6 @@ jobs:
config_opts['plugin_conf']['ccache_enable'] = True
config_opts['plugin_conf']['ccache_opts']['max_cache_size'] = '1G'
config_opts['plugin_conf']['ccache_opts']['compress'] = True
config_opts['plugin_conf']['ccache_opts']['dir'] = "${{ github.workspace }}/.ccache"
EOT
# Fedora cmake build (in imhex.spec)
@@ -1088,10 +1087,6 @@ jobs:
permissions:
id-token: write
attestations: write
env:
CCACHE_DIR: "${{ github.workspace }}/.ccache"
steps:
- name: ⬇️ Install setup dependencies
run: |
@@ -1110,7 +1105,8 @@ jobs:
- name: 📜 Move snap directory to root
run: |
mkdir -p ./snap
envsubst '${IMHEX_VERSION}' < ./dist/snap/snapcraft.yaml > ./snap/snapcraft.yaml
echo "CCACHE=ccache" >> $GITHUB_ENV
envsubst '${IMHEX_VERSION},${CCACHE}' < ./dist/snap/snapcraft.yaml > ./snap/snapcraft.yaml
- name: 📜 Setup ccache
uses: hendrikmuhs/ccache-action@v1

View File

@@ -39,13 +39,12 @@ parts:
- CXX: /usr/bin/g++-14
cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_C_COMPILER_LAUNCHER=/usr/bin/ccache
- -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/ccache
- -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE}
- -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE}
cmake-generator: Ninja
build-packages:
- cmake
- ninja-build
- ccache
- gcc-14
- g++-14
- git