From 8bb4b483c82274e42146fe660276078db241cd96 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@tea.xyz>
Date: Fri, 3 Feb 2023 19:52:04 -0500
Subject: [PATCH] sync workflows with pantry.core

---
 .github/workflows/cd.yml      | 11 +++++++++++
 .github/workflows/ci.yml      |  9 +++++++++
 .github/workflows/cleanup.yml |  1 +
 3 files changed, 21 insertions(+)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index f452f341..79069309 100644
--- a/.github/workflows/cd.yml
+++ b/.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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5b1d024..78c5c36e 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index ef7f2bca..c178a119 100644
--- a/.github/workflows/cleanup.yml
+++ b/.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