From 3e2a26a195fd1942fc664cfa9cc99c709d7d818e Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 17 May 2023 22:37:26 +0100 Subject: [PATCH] Bump libfmt to 10.0.0 --- .github/workflows/Android.yml | 7 +++++-- 3rdParty/libfmt/CMakeLists.txt | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml index 80d7955cc..7e948c448 100644 --- a/.github/workflows/Android.yml +++ b/.github/workflows/Android.yml @@ -38,8 +38,8 @@ jobs: uses: actions/cache@v3 with: path: android-project/app/.cxx - key: ${{ github.workflow }}-v1-${{ github.sha }} - restore-keys: ${{ github.workflow }}-v1- + key: ${{ github.workflow }}-v2-${{ github.sha }} + restore-keys: ${{ github.workflow }}-v2- - name: Build working-directory: ${{github.workspace}} @@ -52,3 +52,6 @@ jobs: with: name: devilutionx-debug.apk path: android-project/app/build/outputs/apk/debug/app-debug.apk + + - name: Clean up artifacts + run: rm -rf android-project/app/build/outputs diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt index 5eef0b205..f550b736a 100644 --- a/3rdParty/libfmt/CMakeLists.txt +++ b/3rdParty/libfmt/CMakeLists.txt @@ -18,10 +18,9 @@ if(NXDK) URL_HASH MD5=310c79c7a5cda3ad8f4e0d44d9fc1c57 ) else() - # master on 2022-03-12 FetchContent_Declare(libfmt - URL https://github.com/fmtlib/fmt/archive/7f882918eba6430a0509b5e8547de21611264c5c.tar.gz - URL_HASH MD5=03fd08aeabf9021c6bf19fbd84d5e62e + URL https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz + URL_HASH MD5=fa629bc1178918b7af4b2ea6b6a271dc ) endif() FetchContent_MakeAvailableExcludeFromAll(libfmt)