From 0cce6d0193440b2a77dd0be0bacb3e2c23bd1e56 Mon Sep 17 00:00:00 2001 From: fdr400 Date: Sun, 5 Jan 2025 20:43:18 +0300 Subject: [PATCH] Better --- .github/workflows/alpine.yml | 14 +++++++------- .github/workflows/ci.yml | 17 ++++++++--------- .github/workflows/macos.yml | 12 ++++++------ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 9e6414774be0..25aa70b9b63c 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -107,13 +107,6 @@ jobs: cd build_debug cmake --build . -j$(nproc) - - name: Show cache stats - shell: alpine.sh {0} - run: | - du -h -d 1 ${{env.CCACHE_DIR}} - du -h -d 1 ${{env.CPM_SOURCE_CACHE}} - ccache -s -v - - name: Save cached directories uses: actions/cache/save@v4 with: @@ -121,3 +114,10 @@ jobs: ${{env.CCACHE_DIR}} ${{env.CPM_SOURCE_CACHE}} key: ${{ steps.restore-cache.outputs.cache-primary-key }} + + - name: Show cache stats + shell: alpine.sh {0} + run: | + du -h -d 1 ${{env.CCACHE_DIR}} + du -h -d 1 ${{env.CPM_SOURCE_CACHE}} + ccache -s -v diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0a89f6e6ab6..271e32032928 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -236,9 +236,7 @@ jobs: - name: Run cmake run: | - mkdir build_debug - cd build_debug - cmake ${{matrix.cmake-flags}} .. + cmake -S . -B build_debug ${{matrix.cmake-flags}} - name: Run clang-tidy if: matrix.info == 'clang-14 + debug + sanitize addr+ub' @@ -263,12 +261,6 @@ jobs: cd build_debug cmake --build . -j $(nproc) - - name: Show cache stats - run: | - du -h -d 1 ${{env.CCACHE_DIR}} - du -h -d 1 ${{env.CPM_SOURCE_CACHE}} - ccache -s -v - - name: Save cached directories uses: actions/cache/save@v4 with: @@ -277,6 +269,13 @@ jobs: ${{env.CPM_SOURCE_CACHE}} key: ${{ steps.restore-cache.outputs.cache-primary-key }} + - name: Show cache stats + run: | + du -h -d 1 ${{env.CCACHE_DIR}} + du -h -d 1 ${{env.CPM_SOURCE_CACHE}} + ccache -s -v + + - name: Run tests (universal) run: | echo "UBSAN_OPTIONS=${UBSAN_OPTIONS} ASAN_OPTIONS=${ASAN_OPTIONS}" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 04f697915667..5254f5f637b3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -76,12 +76,6 @@ jobs: run: | cmake --build build_debug -j$(nproc) -- -k 1 - - name: Show cache stats - run: | - du -h -d 1 ${{env.CCACHE_DIR}} - du -h -d 1 ${{env.CPM_SOURCE_CACHE}} - ccache -s -v - - name: Save cached directories uses: actions/cache/save@v4 with: @@ -89,3 +83,9 @@ jobs: ${{env.CCACHE_DIR}} ${{env.CPM_SOURCE_CACHE}} key: ${{ steps.restore-cache.outputs.cache-primary-key }} + + - name: Show cache stats + run: | + du -h -d 1 ${{env.CCACHE_DIR}} + du -h -d 1 ${{env.CPM_SOURCE_CACHE}} + ccache -s -v