noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dependabot/submodules/lib/settings-7e99623

Browse source
This commit is contained in:
Felanbird 2024-01-17 22:49:09 -05:00 committed by GitHub
parent 4d1f5b6f01 f508a2c92d
commit 3549dcfe77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -174,7 +174,7 @@ jobs:
- name: Cache conan packages (Windows) - name: Cache conan packages (Windows)
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }} key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }}
path: ~/.conan2/ path: ~/.conan2/

2
.github/workflows/test-windows.yml vendored
View file

@ -83,7 +83,7 @@ jobs:
sccache-test-${{ matrix.os }}-${{ matrix.qt-version }} sccache-test-${{ matrix.os }}-${{ matrix.qt-version }}
- name: Cache conan packages - name: Cache conan packages
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }} key: ${{ runner.os }}-conan-user-${{ hashFiles('**/conanfile.py') }}${{ env.C2_CONAN_CACHE_SUFFIX }}
path: ~/.conan2/ path: ~/.conan2/

2
lib/lua/src

@ -1 +1 @@
Subproject commit 6baee9ef9d5657ab582c8a4b9f885ec58ed502d0 Subproject commit 7923dbbf72da303ca1cca17efd24725668992f15