sync workflows with pantry.core

.github/workflows/cd.yml

@@ -24,10 +24,21 @@ jobs:
           AWS_S3_CACHE: ${{ secrets.AWS_S3_CACHE }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
   bottle-pr:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+        - darwin+x86-64
+        - linux+x86-64
+        - darwin+aarch64
+        - linux+aarch64
     needs: [cd]
     if: ${{ needs.cd.outputs.HAS_ARTIFACTS == 'true' }}
     uses: teaxyz/pantry.core/.github/workflows/bottle.yml@main
+    with:
+      platform: ${{ matrix.platform }}
     secrets: inherit
   bottle-standalone:
     runs-on: ubuntu-latest

.github/workflows/ci.yml

@@ -13,8 +13,17 @@ jobs:
         with:
           PATTERNS: projects/**/package.yml
   build:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+        - darwin+x86-64
+        - linux+x86-64
+        - darwin+aarch64
+        - linux+aarch64
     needs: [get-diff]
     uses: teaxyz/pantry.core/.github/workflows/build.yml@main
     with:
       projects: ${{ needs.get-diff.outputs.diff || 'zlib.net' }}
+      platform: ${{ matrix.platform }}
     secrets: inherit

.github/workflows/cleanup.yml

@@ -6,6 +6,7 @@ on:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == false
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1