Better

userver-framework · Jan 5, 2025 · 0cce6d0 · 0cce6d0
1 parent 59e8281
commit 0cce6d0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -107,17 +107,17 @@ 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:
                 path: |
                   ${{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
@@ -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
@@ -76,16 +76,16 @@ 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:
                 path: |
                   ${{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