From cd97c238f3743f1ed877ef0370a82686d54ccf12 Mon Sep 17 00:00:00 2001 From: Dextinfire <> Date: Sun, 8 Sep 2024 00:58:15 -0700 Subject: [PATCH] Fix mac cache and try to force release --- .github/workflows/pipeline.yml | 4 ++-- CMakePresets.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 5238af17..ae4dc0b5 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -48,7 +48,7 @@ jobs: - name: Cache LibAtrac9 uses: actions/cache@v3 with: - key: libatrac9 | ${{ runner.os }} + key: libatrac9 | ${{ matrix.os_name }} path: vendor/LibAtrac9 - uses: lukka/get-cmake@latest @@ -93,7 +93,7 @@ jobs: with: cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' configurePreset: ci-release - configurePresetAdditionalArgs: "['-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}', '-DVCPKG_HOST_TRIPLET=${{ matrix.triplet }}']" + configurePresetAdditionalArgs: "['-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}', '-DVCPKG_HOST_TRIPLET=${{ matrix.triplet }}', '-DVCPKG_BUILD_TYPE=release']" buildPreset: CI-Build - name: Copy docs diff --git a/CMakePresets.json b/CMakePresets.json index 3b246a81..73f6951f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -26,8 +26,7 @@ "installDir": "release/${presetName}", "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "VCPKG_BUILD_TYPE": "release" + "CMAKE_BUILD_TYPE": "Release" } } ],