temp

Author: k3DW

.github/actions/common-macos/action.yml .github/actions/build-macos/action.yml.github/actions/common-macos/action.yml renamed to .github/actions/build-macos/action.yml

@@ -1,4 +1,4 @@
-name: macos
+name: build-macos
 
 inputs:
   config-preset:
@@ -13,8 +13,8 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Caching
-      uses: ./.github/actions/caching
+    - name: Cache restore
+      uses: ./.github/actions/cache-restore
       with:
         key-prefix: macos-${{ inputs.arch }}
 
@@ -35,3 +35,8 @@ runs:
       run: |
         cmake --build --preset ${{ inputs.build-preset }} -j8
       shell: bash
+
+    - name: Cache save
+      uses: ./.github/actions/cache-save
+      with:
+        key-prefix: macos-${{ inputs.arch }}

.github/actions/common-windows/action.yml .github/actions/build-windows/action.yml.github/actions/common-windows/action.yml renamed to .github/actions/build-windows/action.yml

@@ -1,4 +1,4 @@
-name: windows
+name: build-windows
 
 inputs:
   config-preset:
@@ -9,8 +9,8 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Caching
-      uses: ./.github/actions/caching
+    - name: Cache restore
+      uses: ./.github/actions/cache-restore
       with:
         key-prefix: windows
 
@@ -23,3 +23,8 @@ runs:
       run: |
         cmake --build --preset ${{ inputs.build-preset }} -j8
       shell: powershell
+
+    - name: Cache save
+      uses: ./.github/actions/cache-save
+      with:
+        key-prefix: windows

.github/actions/caching/action.yml .github/actions/cache-common/action.yml.github/actions/caching/action.yml renamed to .github/actions/cache-common/action.yml

@@ -1,22 +1,25 @@
-name: caching
+name: cache-common
 
 inputs:
+  type:
+    required: true
   key-prefix:
     required: false
 
 runs:
   using: "composite"
   steps:
     - name: Cache build and vcpkg
-      uses: actions/cache@v4
+      if: ${{ inputs.key-prefix }} != ""
+      uses: actions/cache/${{ inputs.type }}@v4
       with:
         path: |
           build
           external/vcpkg
         key: ${{ inputs.key-prefix }}-2025-07-18
 
     - name: Cache bin
-      uses: actions/cache@v4
+      uses: actions/cache/${{ inputs.type }}@v4
       with:
         path: |
           bin

.github/actions/cache-restore/action.yml

@@ -0,0 +1,14 @@
+name: cache-restore
+
+inputs:
+  key-prefix:
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Cache restore
+      uses: ./.github/actions/cache-common
+      with:
+        type: restore
+        key-prefix: macos-${{ inputs.arch }}

.github/actions/cache-save/action.yml

@@ -0,0 +1,14 @@
+name: cache-save
+
+inputs:
+  key-prefix:
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Cache save
+      uses: ./.github/actions/cache-common
+      with:
+        type: save
+        key-prefix: macos-${{ inputs.arch }}

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
     uses: ./.github/workflows/test.yml
 
   build-windows:
-    needs: run-tests
+    needs: [run-tests]
     runs-on: windows-2025
     steps:
       - name: Checkout code
@@ -15,7 +15,7 @@ jobs:
           submodules: recursive
 
       - name: Configure and build
-        uses: ./.github/actions/common-windows
+        uses: ./.github/actions/build-windows
         with:
           config-preset: Release
           build-preset: Release
@@ -30,7 +30,7 @@ jobs:
           path: .\bin\Release\PartStackerGUI-windows.exe
 
   build-macos-arm64:
-    needs: run-tests
+    needs: [run-tests]
     runs-on: macos-15
     steps:
       - name: Checkout code
@@ -39,15 +39,15 @@ jobs:
           submodules: recursive
 
       - name: Configure and build arm64
-        uses: ./.github/actions/common-macos
+        uses: ./.github/actions/build-macos
         with:
           config-preset: Release
           build-preset: Release
           vcpkg-triplet: arm64-osx
           arch: arm64
 
   build-macos-x64:
-    needs: run-tests
+    needs: [run-tests, build-macos-arm64]
     runs-on: macos-15
     steps:
       - name: Checkout code
@@ -56,7 +56,7 @@ jobs:
           submodules: recursive
 
       - name: Configure and build x64
-        uses: ./.github/actions/common-macos
+        uses: ./.github/actions/build-macos
         with:
           config-preset: Release
           build-preset: Release
@@ -72,8 +72,8 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Caching
-        uses: ./.github/actions/caching
+      - name: Cache restore
+        uses: ./.github/actions/cache-restore
 
       - name: Merge binaries
         run: |
@@ -98,3 +98,6 @@ jobs:
         with:
           name: PartStackerGUI-mac
           path: ./bin/Release/PartStackerGUI-mac.dmg
+
+      - name: Cache save
+        uses: ./.github/actions/cache-restore

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
           submodules: recursive
 
       - name: Configure and build
-        uses: ./.github/actions/common-windows
+        uses: ./.github/actions/build-windows
         with:
           config-preset: Debug
           build-preset: Tests
@@ -31,7 +31,7 @@ jobs:
           submodules: recursive
 
       - name: Configure and build
-        uses: ./.github/actions/common-macos
+        uses: ./.github/actions/build-macos
         with:
           config-preset: Debug
           build-preset: Tests