mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
Merge branch 'master' into dependabot/submodules/lib/settings-7e99623
This commit is contained in:
commit
3549dcfe77
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -174,7 +174,7 @@ jobs:
|
|||
|
||||
- name: Cache conan packages (Windows)
|
||||
if: startsWith(matrix.os, 'windows')
|
||||
uses: actions/cache@v3
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }}
|
||||
path: ~/.conan2/
|
||||
|
|
2
.github/workflows/test-windows.yml
vendored
2
.github/workflows/test-windows.yml
vendored
|
@ -83,7 +83,7 @@ jobs:
|
|||
sccache-test-${{ matrix.os }}-${{ matrix.qt-version }}
|
||||
|
||||
- name: Cache conan packages
|
||||
uses: actions/cache@v3
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }}
|
||||
path: ~/.conan2/
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 6baee9ef9d5657ab582c8a4b9f885ec58ed502d0
|
||||
Subproject commit 7923dbbf72da303ca1cca17efd24725668992f15
|
Loading…
Reference in a new issue