From 35e63f4fe6eafb993822a0372e968d592ac81d04 Mon Sep 17 00:00:00 2001
From: pwalczysko <p.walczysko@dundee.ac.uk>
Date: Wed, 18 Sep 2024 19:46:47 +0100
Subject: [PATCH] Adjust the upload and download of artifacts v4

---
 .github/workflows/gradle.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index cddb2d47c..9a0dc3ca3 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -78,28 +78,28 @@ jobs:
         if: startsWith(matrix.os, 'ubuntu') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
         uses: actions/upload-artifact@v4
         with:
-            name: artifacts
+            name: artifacts-${{ matrix.os }}-OMERO
             path: build/distributions/OMERO*
             if-no-files-found: error
       - name: Upload jar
         if: startsWith(matrix.os, 'ubuntu') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-${{ matrix.os }}-omero_
           path: build/libs/omero_*
           if-no-files-found: error
       - name: Upload insight artifacts
         if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-${{ matrix.os }}-insight
           path: build/packaged/main/bundles/*
           if-no-files-found: error
       - name: Upload importer artifacts
         if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags') && startsWith(matrix.java, '8')
         uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-${{ matrix.os }}-importer
           path: build/packaged/installImporterDist/bundles/*
 
   release:
@@ -115,7 +115,7 @@ jobs:
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: artifacts/*
+          file: artifacts*/*
           tag: ${{ github.ref }}
           overwrite: true
           file_glob: true