From 11d5a7ca4d64578f2cf20042dc7f66074672326d Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 24 Dec 2023 16:11:12 -0800
Subject: [PATCH] Update build.yml

---
 .../actions/publish-test-artifact/action.yml  | 17 ++++
 .github/workflows/build.yml                   | 90 +++++++++++++++++--
 2 files changed, 102 insertions(+), 5 deletions(-)
 create mode 100644 .github/actions/publish-test-artifact/action.yml

diff --git a/.github/actions/publish-test-artifact/action.yml b/.github/actions/publish-test-artifact/action.yml
new file mode 100644
index 000000000..c73d54bab
--- /dev/null
+++ b/.github/actions/publish-test-artifact/action.yml
@@ -0,0 +1,17 @@
+# https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
+
+name: Set up environment
+description: Runs setup actions and installs packages
+
+inputs:
+  runtime:
+    description: '.net runtime'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.runtime }}-tests
+        path: _tests/net6.0/${{ inputs.runtime }}/publish/**/*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae96cff8d..727027ee0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,14 +42,94 @@ jobs:
       shell: bash
       run: ./build.sh --backend --enable-extra-platforms --packages
 
+    # Test Artifacts
+
     - name: Publish win-x64 Test Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/publish-test-artifact@v1
       with:
-        name: win-x64-tests
-        path: _tests/net6.0/win-x64/publish/**/*
+        runtime: win-x64
 
     - name: Publish win-x86 Test Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: win-x86
+
+    - name: Publish linux-x64 Test Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: linux-x64
+
+    - name: Publish linux-musl-x64 Test Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: linux-musl-x64
+
+    - name: Publish osx-x64 Test Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: osx-x64
+
+    - name: Publish freebsd-x64 Test Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: freebsd-x64
+
+    # Artifacts
+
+    - name: Publish win-x64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: win-x64
+
+    - name: Publish win-x86 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: win-x86
+
+    - name: Publish linux-x64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: linux-x64
+
+    - name: Publish linux-musl-x64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: linux-musl-x64
+
+    - name: Publish linux-arm64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: linux-arm64
+
+    - name: Publish linux-musl-arm64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: linux-musl-arm64
+
+    - name: Publish linux-arm Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: linux-arm
+
+    - name: Publish osx-x64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: osx-x64
+
+    - name: Publish osx-arm64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: osx-arm64
+
+    - name: Publish freebsd-x64 Artifact
+      uses: actions/publish-test-artifact@v1
+      with:
+        runtime: freebsd-x64
+
+    # Distribution Artifact
+    
+    - name: Publish Distribution Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: win-x86-tests
-        path: _tests/net6.0/win-x86/publish/**/*
+        name: distribution
+        path: distribution/**/*