Fix artifact naming.

disorderedmaterials · Oct 24, 2024 · 05f641c · 05f641c
1 parent 0950279
commit 05f641c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/build/linux/action.yml b/.github/workflows/build/linux/action.yml
@@ -77,14 +77,14 @@ runs:
       echo "Source dir is: ${HDF5_DIR}"
       INSTALL_DIR="build/${TAG}"
       echo "Install dir is: ${INSTALL_DIR}"
-      mkdir packages
+      mkdir packages-linux
       cd build
       cp ${SZIP_INSTALL_DIR}/lib/libszip-static.a ${TAG}/lib
       cp ${ZLIB_INSTALL_DIR}/lib/libz*.a ${TAG}/lib
-      zip -9rv ../packages/${TAG}-linux.zip ${TAG}
+      zip -9rv ../packages-linux/${TAG}-linux.zip ${TAG}
 
   - name: Upload Package Artifacts
     uses: actions/upload-artifact@v4
     with:
-      name: packages
-      path: ${{ github.workspace }}/packages
+      name: packages-linux
+      path: ${{ github.workspace }}/packages-linux
diff --git a/.github/workflows/build/osx/action.yml b/.github/workflows/build/osx/action.yml
@@ -78,14 +78,14 @@ runs:
       echo "Source dir is: ${HDF5_DIR}"
       INSTALL_DIR="build/${TAG}"
       echo "Install dir is: ${INSTALL_DIR}"
-      mkdir packages
+      mkdir packages-osx
       cd build
       cp ${SZIP_INSTALL_DIR}/lib/libszip-static.a ${TAG}/lib
       cp ${ZLIB_INSTALL_DIR}/lib/libz*.a ${TAG}/lib
-      zip -9rv ../packages/${TAG}-osx.zip ${TAG}
+      zip -9rv ../packages-osx/${TAG}-osx.zip ${TAG}
 
   - name: Upload Raw Build Artifacts
     uses: actions/upload-artifact@v4
     with:
-      name: packages
-      path: ${{ github.workspace }}/packages
+      name: packages-osx
+      path: ${{ github.workspace }}/packages-osx
diff --git a/.github/workflows/build/windows/action.yml b/.github/workflows/build/windows/action.yml
@@ -72,8 +72,8 @@ runs:
     if: always()
     uses: actions/upload-artifact@v4
     with:
-      name: build
-      path: ${{ github.workspace }}/build
+      name: build-windows
+      path: ${{ github.workspace }}/build-windows
 
   - name: Create Zip
     shell: bash
@@ -86,14 +86,14 @@ runs:
       echo "Source dir is: ${HDF5_DIR}"
       INSTALL_DIR="build/${TAG}"
       echo "Install dir is: ${INSTALL_DIR}"
-      mkdir packages
+      mkdir packages-windows
       cd build
       cp ${SZIP_INSTALL_DIR}/lib/libszip-static.a ${TAG}/lib
       cp ${ZLIB_INSTALL_DIR}/lib/libz*.a ${TAG}/lib
-      7z a ../packages/${TAG}-windows.zip ${TAG}
+      7z a ../packages-windows/${TAG}-windows.zip ${TAG}
 
   - name: Upload Raw Build Artifacts
-    uses: actions/upload-artifact@v3
+    uses: actions/upload-artifact@v4
     with:
-      name: packages
-      path: ${{ github.workspace }}/packages
+      name: packages-windows
+      path: ${{ github.workspace }}/packages-windows
diff --git a/.github/workflows/publish/action.yml b/.github/workflows/publish/action.yml
@@ -7,9 +7,11 @@ runs:
   - name: Download Artifacts
     uses: actions/download-artifact@v4
     with:
-      name: packages
+      pattern: packages-*
+      merge-multiple: true
       path: ${{ github.workspace }}/packages
 
+
   - name: Download Prerequisites
     shell: bash
     run: |