Separate out Windows CI

Author: rjsheperd

.github/workflows/jar-builder.yml

@@ -25,15 +25,14 @@ jobs:
         if: ${{ !env.ACT }}
         uses: DeterminateSystems/magic-nix-cache-action@main
 
-      - name: Cache Clojure and Conveyor dependencies
+      - name: Cache Clojure Dependencies
         if: ${{ !env.ACT }}
-        uses: actions/cache@v4
+        id: cache-clojure-deps-restore
+        uses: actions/cache@v5
         with:
           path: |
             ~/.m2/repository
-            ~/.gitlibs
-            ~/.conveyor-cache
-          key: deps-${{ hashFiles('**/deps.edn', '**/conveyor.conf') }}
+          key: deps-${{ hashFiles('**/deps.edn') }}
           restore-keys: |
             deps-
 
@@ -47,16 +46,12 @@ jobs:
           DATE=$(date '+%Y-%m-%d')
           echo "date=$DATE" >> "$GITHUB_ENV"
 
-      - name: Build JAR and Conveyor packages
+      - name: Build JAR
         env:
           VMS_URL: ${{ secrets.VMS_URL }}
           VMS_AUTH_TOKEN: ${{ secrets.VMS_AUTH_TOKEN }}
-          CONVEYOR_CACHE_PATH: ~/.conveyor-cache
         run: |
           cd projects/behave
-
-          # Create cache directory
-          mkdir -p "$CONVEYOR_CACHE_PATH"
           export NIXPKGS_ALLOW_UNFREE=1
 
           # Use Nix development environment to build everything
@@ -68,6 +63,15 @@ jobs:
             bb uber
           "
 
+      - name: Save Clojure Dependencies
+        if: ${{ !env.ACT && !cancelled() }}
+        id: cache-clojure-deps-save
+        uses: actions/cache/save@v5
+        with:
+          path: |
+            ~/.m2/repository
+          key: ${{ steps.cache-clojure-deps-restore.outputs.cache-primary-key }}
+
       - name: List built artifacts
         run: |
           ls -lh projects/behave/target/*.jar || true
@@ -106,9 +110,10 @@ jobs:
         if: ${{ !env.ACT }}
         uses: DeterminateSystems/magic-nix-cache-action@main
 
-      - name: Cache Conveyor dependencies
+      - name: Cache Conveyor Dependencies
         if: ${{ !env.ACT }}
-        uses: actions/cache@v4
+        id: cache-conveyor-restore
+        uses: actions/cache@v5
         with:
           path: |
             ~/.conveyor-cache
@@ -119,11 +124,23 @@ jobs:
       - name: Build Windows package
         env:
           CONVEYOR_CACHE_PATH: ~/.conveyor-cache
+          CONVEYOR_ROOT_KEY: ${{ secrets.CONVEYOR_ROOT_KEY }}
         run: |
           cd projects/behave
           mkdir -p "$CONVEYOR_CACHE_PATH"
           export NIXPKGS_ALLOW_UNFREE=1
-          nix develop --impure --command conveyor make windows-zip
+          nix develop --impure  --command bash -c "
+            conveyor -f conveyor.windows.conf make windows-zip
+          "
+
+      - name: Save Conveyor Dependencies
+        if: ${{ !env.ACT && !cancelled() }}
+        id: cache-conveyor-save
+        uses: actions/cache/save@v5
+        with:
+          path: |
+            ~/.conveyor-cache
+          key: ${{ steps.cache-conveyor-restore.outputs.cache-primary-key }}
 
       - name: Upload Windows package
         uses: actions/upload-artifact@v4

projects/behave/conveyor.windows-ci.conf

@@ -0,0 +1,7 @@
+include required("conveyor.conf")
+
+app {
+  machines = [windows.amd64]
+  sign = false
+}
+