Skip to content

Commit d4c89d2

Browse files
andiwandandiwand
committed
fix
1 parent a2dbc5b commit d4c89d2

3 files changed

Lines changed: 33 additions & 32 deletions

File tree

‎.github/workflows/build_test.yml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
env:
1010
CCACHE_DIR: ${{ github.workspace }}/.ccache
11-
CCACHE_MAXSIZE: 500M
11+
CCACHE_MAXSIZE: 1G
1212
CCACHE_KEY_SUFFIX: r1
1313
CONAN_HOME: ${{ github.workspace }}/.conan2
1414
CONAN_KEY_SUFFIX: r1
@@ -54,26 +54,26 @@ jobs:
5454
if: startsWith(matrix.host_profile, 'android')
5555
run: yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install 'ndk;${{ matrix.ndk_version }}'
5656

57-
- name: cache
57+
- name: cache conan
5858
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
5959
with:
6060
path: ${{ env.CONAN_HOME }}
61-
key: ${{ matrix.host_profile }}-${{ env.CONAN_KEY_SUFFIX }}
61+
key: conan-${{ matrix.host_profile }}-${{ env.CONAN_KEY_SUFFIX }}
6262
restore-keys: |
63-
${{ matrix.host_profile }}-
63+
conan-${{ matrix.host_profile }}-
6464
6565
- name: export conan-odr-index
6666
run: python conan-odr-index/scripts/conan_export_all_packages.py
6767
- name: conan config
6868
run: conan config install .github/config/conan
6969

70-
- name: cache
70+
- name: cache ccache
7171
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
7272
with:
7373
path: ${{ env.CCACHE_DIR }}
74-
key: ${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
74+
key: ccache-${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
7575
restore-keys: |
76-
${{ matrix.host_profile }}-
76+
ccache-${{ matrix.host_profile }}-
7777
7878
- name: conan install
7979
run: >
@@ -307,11 +307,14 @@ jobs:
307307
if: startsWith(matrix.host_profile, 'android')
308308
run: yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install 'ndk;${{ matrix.ndk_version }}'
309309

310-
- name: fetch conan-odr-index
311-
uses: actions/checkout@v4
310+
- name: cache conan
311+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
312312
with:
313-
repository: opendocument-app/conan-odr-index
314-
path: conan-odr-index
313+
path: ${{ env.CONAN_HOME }}
314+
key: conan-${{ matrix.host_profile }}-${{ env.CONAN_KEY_SUFFIX }}
315+
restore-keys: |
316+
conan-${{ matrix.host_profile }}-
317+
315318
- name: export conan-odr-index
316319
run: python conan-odr-index/scripts/conan_export_all_packages.py
317320
- name: conan config
@@ -320,15 +323,13 @@ jobs:
320323
- name: conan odrcore
321324
run: conan export . --name odrcore --version 0.0.0
322325

323-
- name: cache
324-
uses: actions/cache@v4
326+
- name: cache ccache
327+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
325328
with:
326-
path: |
327-
~/.ccache
328-
/Users/runner/Library/Caches/ccache
329-
key: ${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
329+
path: ${{ env.CCACHE_DIR }}
330+
key: ccache-${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
330331
restore-keys: |
331-
${{ matrix.host_profile }}-
332+
ccache-${{ matrix.host_profile }}-
332333
333334
- name: conan install
334335
run: >

‎.github/workflows/publish.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
CCACHE_DIR: ${{ github.workspace }}/.ccache
9-
CCACHE_MAXSIZE: 500M
9+
CCACHE_MAXSIZE: 1G
1010
CCACHE_KEY_SUFFIX: r1
1111
CONAN_HOME: ${{ github.workspace }}/.conan2
1212
CONAN_KEY_SUFFIX: r1
@@ -46,26 +46,26 @@ jobs:
4646
- name: get version
4747
run: echo "VERSION=${GITHUB_REF_NAME:1}" >> $GITHUB_ENV
4848

49-
- name: cache
49+
- name: cache conan
5050
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
5151
with:
5252
path: ${{ env.CONAN_HOME }}
53-
key: ${{ matrix.host_profile }}-${{ env.CONAN_KEY_SUFFIX }}
53+
key: conan-${{ matrix.host_profile }}-${{ env.CONAN_KEY_SUFFIX }}
5454
restore-keys: |
55-
${{ matrix.host_profile }}-
55+
conan-${{ matrix.host_profile }}-
5656
5757
- name: export conan-odr-index
5858
run: python conan-odr-index/scripts/conan_export_all_packages.py
5959
- name: conan config
6060
run: conan config install .github/config/conan
6161

62-
- name: cache
62+
- name: cache ccache
6363
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
6464
with:
6565
path: ${{ env.CCACHE_DIR }}
66-
key: ${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
66+
key: ccache-${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
6767
restore-keys: |
68-
${{ matrix.host_profile }}-
68+
ccache-${{ matrix.host_profile }}-
6969
7070
- name: conan install
7171
run: >

‎.github/workflows/tidy.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
env:
1010
CCACHE_DIR: ${{ github.workspace }}/ccache
11-
CCACHE_MAXSIZE: 500M
11+
CCACHE_MAXSIZE: 1G
1212
CCACHE_KEY_SUFFIX: r1
1313
CONAN_HOME: ${{ github.workspace }}/.conan2
1414
CONAN_KEY_SUFFIX: r1
@@ -47,26 +47,26 @@ jobs:
4747
- name: install python dependencies
4848
run: pip install --upgrade pip conan
4949

50-
- name: cache
50+
- name: cache conan
5151
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
5252
with:
5353
path: ${{ env.CONAN_HOME }}
54-
key: ${{ matrix.host_profile }}-${{ env.CONAN_KEY_SUFFIX }}
54+
key: conan-${{ matrix.host_profile }}-${{ env.CONAN_KEY_SUFFIX }}
5555
restore-keys: |
56-
${{ matrix.host_profile }}-
56+
conan-${{ matrix.host_profile }}-
5757
5858
- name: export conan-odr-index
5959
run: python conan-odr-index/scripts/conan_export_all_packages.py
6060
- name: conan config
6161
run: conan config install .github/config/conan
6262

63-
- name: cache
63+
- name: cache ccache
6464
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
6565
with:
6666
path: ${{ env.CCACHE_DIR }}
67-
key: ${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
67+
key: ccache-${{ matrix.host_profile }}-${{ env.CCACHE_KEY_SUFFIX }}
6868
restore-keys: |
69-
${{ matrix.host_profile }}-
69+
ccache-${{ matrix.host_profile }}-
7070
7171
- name: conan install
7272
run: >

0 commit comments

Comments
 (0)