cache macOS CI

phusion · Oct 6, 2024 · 6946645 · 6946645
1 parent d1ed88a
commit 6946645
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -57,7 +57,7 @@ jobs:
         with:
           submodules: true
 
-      - run: mkdir cache runtime
+      - run: mkdir cache runtime output
         working-directory: packaging/binaries
 
       - name: Determine runtime version
@@ -82,7 +82,7 @@ jobs:
         run: xargs -I{} "$HOME/.rvm/bin/rvm" install ruby-{} < packaging/binaries/shared/definitions/ruby_versions
         if: steps.fetch_rvm_cache.outputs.cache-hit != 'true'
 
-      - name: Update runtime cache
+      - name: Update RVM cache
         run: CACHE_PATH="$HOME/.rvm" ./dev/ci/update-cache-az-blob-storage
         if: steps.fetch_rvm_cache.outputs.cache-hit != 'true'
         env:
@@ -112,9 +112,19 @@ jobs:
           CACHE_PATH: packaging/binaries/runtime
 
 
-      - run: ./dev/ci/tests/binaries/build-macos
+      - run: ./macos/build -p "$WORKSPACE" -r runtime -c cache -o output -j 4 passenger nginx
+        env:
+          WORKSPACE: ${{ github.workspace }}
+        working-directory: packaging/binaries
+
       - uses: actions/upload-artifact@v4
         with:
           name: binaries-macos-${{ matrix.arch }}
-          path: 'output-macos-${{ matrix.arch }}/**/*'
-      - run: ./dev/ci/tests/binaries/test-macos
+          path: 'output/**/*'
+
+
+      - run: ./macos/package -i output -o output
+        working-directory: packaging/binaries
+
+      - run: ./macos/test -p ../.. -r runtime -i output -I output
+        working-directory: packaging/binaries
diff --git a/dev/ci/fetch-cache-az-blob-storage b/dev/ci/fetch-cache-az-blob-storage
@@ -41,6 +41,7 @@ if [[ "$EXISTS" = True ]]; then
 	mkdir -p "$CACHE_PATH"
 	tar -C "$CACHE_PATH" -x --zstd -f "$CACHE_PATH.tar.zstd"
 	rm "$CACHE_PATH.tar.zstd"
+	echo "Extracted"
 
 	echo "cache-hit=true" >> "$GITHUB_OUTPUT"
 else