From 705b2a24bed5f3298222ee623892bedab88fbb9c Mon Sep 17 00:00:00 2001
From: Noemi <45180344+unflxw@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:48:07 +0100
Subject: [PATCH] Actually publish macOS releases

A [previous PR][oops] attempted to build macOS releases from an
Ubuntu runner, which cannot possibly work.

[oops]: https://github.com/appsignal/appsignal-wrap/pull/26

I then [attempted to do the whole build in a macOS runner][whoopsie],
which also didn't work, as running Docker on macOS requires Docker
Desktop.

[whoopsie]: https://github.com/appsignal/appsignal-wrap/compare/9907babe8f0ca41262b56595fb6841a16f5ed7e6...2ed30706a2bb4dd39d348675628ec71df6ebec46

This commit follows [the agent's approach][:brain:], using a build
matrix to build macOS builds on a macOS runner and Linux builds on
an Ubuntu runner, then publishing it from an Ubuntu runner in a
separate job.

[:brain:]: https://github.com/appsignal/appsignal-agent/blob/96b5b6721804e7e15546ed6faf86348b5fa01c13/.github/workflows/publish_release.yml#L81-L100
---
 .github/workflows/publish_release.yaml | 66 +++++++++++++++++++++++---
 mono.yml                               |  2 +-
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
index 0902fc4..e8e6552 100644
--- a/.github/workflows/publish_release.yaml
+++ b/.github/workflows/publish_release.yaml
@@ -8,9 +8,60 @@ env:
   PUBLISH_GIT_EMAIL: "support+build-sign@appsignal.com"
 
 jobs:
+  build:
+    name: "Build the release"
+    runs-on: ${{matrix.runner}}
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - runner: ubuntu-22.04
+            target: "x86_64-unknown-linux-gnu"
+          - runner: ubuntu-22.04
+            target: "x86_64-unknown-linux-musl"
+          - runner: ubuntu-22.04
+            target: "aarch64-unknown-linux-gnu"
+          - runner: ubuntu-22.04
+            target: "aarch64-unknown-linux-musl"
+          - runner: macos-14
+            target: "x86_64-apple-darwin"
+          - runner: macos-14
+            target: "aarch64-apple-darwin"
+    steps:
+      - name: "Checkout the project"
+        uses: actions/checkout@v4
+
+      - name: "Install Cross"
+        run: |
+          cargo install cross
+
+      # Linux targets will cross compile on Docker images used by cross
+      - name: "Login to Docker Hub"
+        if: matrix.runner == 'ubuntu-22.04'
+        uses: docker/login-action@v3
+        with:
+          username: ${{secrets.PUBLISH_DOCKERHUB_USERNAME}}
+          password: ${{secrets.PUBLISH_DOCKERHUB_TOKEN}}
+
+      - name: "Build artifact"
+        run: |
+          script/build_artifact "${{matrix.target}}"
+
+      # Temporarily store the build artifact as a GitHub Action artifact to
+      # move it to the next job.
+      - name: "Store build artifact"
+        uses: actions/upload-artifact@v4
+        with:
+          name: "${{matrix.target}}"
+          path: "release/${{matrix.target}}.tar.gz"
+          retention-days: 1
+          if-no-files-found: error
+
   publish:
     name: "Publish the release"
-    runs-on: macos-14
+    needs:
+      - build
+    runs-on: ubuntu-22.04
     steps:
       - name: "Checkout the project"
         uses: actions/checkout@v4
@@ -39,10 +90,6 @@ jobs:
           touch ~/.ssh/allowed_signers
           echo "$(git config --get user.email) namespaces=\"git\" $(cat $PUBLISH_GIT_SIGN_KEY_PATH.pub)" >> ~/.ssh/allowed_signers
           git config --global user.signingkey "$PUBLISH_GIT_SIGN_KEY_PATH"
-      
-      - name: "Install Cross"
-        run: |
-          cargo install cross
 
       - name: "Login to Docker Hub"
         uses: docker/login-action@v3
@@ -50,7 +97,12 @@ jobs:
           username: ${{secrets.PUBLISH_DOCKERHUB_USERNAME}}
           password: ${{secrets.PUBLISH_DOCKERHUB_TOKEN}}
 
-      - name: "Build artifacts and push release tag"
+      - name: "Fetch build artifacts"
+        uses: actions/download-artifact@v4
+        with:
+          path: release
+
+      - name: "Push release tag"
         id: version
         working-directory: "./main"
         run: |
@@ -73,6 +125,6 @@ jobs:
             'release/aarch64-unknown-linux-musl.tar.gz#Linux (arm64, musl)' \
             'release/x86_64-apple-darwin.tar.gz#macOS (x86_64)' \
             'release/aarch64-apple-darwin.tar.gz#macOS (arm64)' \
-            'release/install.sh#Installer script'
+            'install.sh#Installer script'
         env:
           GH_TOKEN: ${{github.token}}
diff --git a/mono.yml b/mono.yml
index 269ba0f..933a3b6 100644
--- a/mono.yml
+++ b/mono.yml
@@ -2,7 +2,7 @@
 language: "custom"
 repo: "https://github.com/appsignal/appsignal-wrap"
 build:
-  command: "script/build_artifacts"
+  command: "echo 'Can only build from GitHub Actions'"
 publish:
   command: "echo 'Can only publish from GitHub Actions'"
 test: