From a1a4c999c407ef61fe22e2c31ef29a9784b7db88 Mon Sep 17 00:00:00 2001
From: David Stirling <dstirling@glencoesoftware.com>
Date: Mon, 29 Apr 2024 15:31:04 +0100
Subject: [PATCH] Rewrite release generator

---
 .github/workflows/release.yml | 43 +++++++++--------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 72235fe552..9083af8147 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ jobs:
         python-version: [ "3.8" ]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: Checkout Repo
       - uses: actions/setup-python@v4
         name: Install Python
@@ -115,40 +115,19 @@ jobs:
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v2
-      - env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        id: create_release
-        uses: actions/create-release@v1
-        with:
-          draft: true
-          prerelease: true
-          release_name: ${{ github.ref }}
-          tag_name: ${{ github.ref }}
-      - uses: actions/download-artifact@v1
-        with:
-          name: CellProfiler-macOS-4.2.60001-ai.dmg
-          path: ./
-      - uses: actions/download-artifact@v1
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: CellProfiler-Windows-4.2.60001-ai.exe
           path: ./
-      - env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: actions/upload-release-asset@v1
-        with:
-          asset_content_type: application/zip
-          asset_name: CellProfiler-macOS-4.2.60001-ai.dmg
-          asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-macOS-4.2.60001-ai.dmg
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-      - env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: actions/upload-release-asset@v1
+          merge-multiple: true
+      - name: Create release
+        uses: softprops/action-gh-release@v2
         with:
-          asset_content_type: application/exe
-          asset_name: CellProfiler-Windows-4.2.60001-ai.exe
-          asset_path: /home/runner/work/CellProfiler/CellProfiler/CellProfiler-Windows-4.2.60001-ai.exe
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          draft: true
+          files: |
+            ./*.exe
+            ./*.dmg
+
 name: create-release
 on:
   push: