From 7adf5e1aaf827d0fc9cda82cdb2b0f039fce85b0 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Sun, 2 Jun 2024 15:38:14 -0500
Subject: [PATCH] Update steps (#262)

---
 .github/workflows/ant-app.yml | 53 +++++++++++++++++++++++++++--------
 .github/workflows/ant.yml     | 41 +++++++++++++++++++++++----
 2 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index 44792ef0..38e3abd3 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -59,7 +59,7 @@ jobs:
     - name: Enable Developer Command Prompt
       uses: ilammy/msvc-dev-cmd@v1.13.0
 
-    - name: Get hdf4 snapshot
+    - name: Get hdf4 release
       if: ${{ (inputs.use_environ == 'release') }}
       uses: dsaltares/fetch-gh-release-asset@master
       with:
@@ -105,7 +105,7 @@ jobs:
         echo "HDFLIB_ENV=$HDFDIR" >> $GITHUB_OUTPUT
       shell: bash
 
-    - name: Get hdf5 snapshot
+    - name: Get hdf5 release
       if: ${{ (inputs.use_environ == 'release') }}
       uses: dsaltares/fetch-gh-release-asset@master
       with:
@@ -200,7 +200,7 @@ jobs:
         ant -noinput -buildfile build.xml binaryAppPackage
       shell: bash
 
-    - name: Rename snapshot binary base name
+    - name: Rename snapshot binary-app base name
       id: ren-basename
       if: ${{ (inputs.use_environ == 'snapshots') }}
       run: |
@@ -215,12 +215,22 @@ jobs:
       shell: pwsh
 
     # Save files created by ctest script
-    - name: Save published binary (Win)
+    - name: Save published binary-app (Win)
       uses: actions/upload-artifact@v4
       with:
             name: zip-win-vs2022-app-binary
             path: ${{ github.workspace }}/build/dist/${{ steps.set-file-base.outputs.FILE_BASE }}App-win64.zip
             if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+
+    # Save release files created by ctest script
+    - name: Save published release-app binary (Win)
+      uses: actions/upload-artifact@v4
+      with:
+            name: zip-win-vs2022-app-binary
+            path: ${{ github.workspace }}/build/dist/${{ inputs.snap_name }}App-win64.zip
+            if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'release') }}
 
     - name: Test with Ant
       env:
@@ -242,7 +252,7 @@ jobs:
         java-version: '21'
         distribution: 'temurin'
 
-    - name: Get hdf4 snapshot
+    - name: Get hdf4 release
       if: ${{ (inputs.use_environ == 'release') }}
       uses: dsaltares/fetch-gh-release-asset@master
       with:
@@ -353,7 +363,7 @@ jobs:
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
       run: ant -noinput -buildfile build.xml binaryAppPackage
 
-    - name: Rename snapshot binary base name
+    - name: Rename snapshot binary-app base name
       id: ren-basename
       if: ${{ (inputs.use_environ == 'snapshots') }}
       run: |
@@ -367,12 +377,21 @@ jobs:
             ls -l ${{ runner.workspace }}
 
     # Save files created by ctest script
-    - name: Save published binary (Linux)
+    - name: Save published snapshot-app binary (Linux)
       uses: actions/upload-artifact@v4
       with:
             name: tgz-ubuntu-2204-app-binary
             path: ${{ github.workspace }}/build/dist/${{ steps.set-file-base.outputs.FILE_BASE }}App-Linux-x86_64.tar.gz
             if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+
+    - name: Save published release-app binary (Linux)
+      uses: actions/upload-artifact@v4
+      with:
+            name: tgz-ubuntu-2204-app-binary
+            path: ${{ github.workspace }}/build/dist/${{ inputs.snap_name }}App-Linux-x86_64.tar.gz
+            if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'release') }}
 
     - name: Test with Ant
       env:
@@ -442,7 +461,7 @@ jobs:
         version: 'tags/snapshot'
         file: '${{ inputs.use_hdf }}-osx.tar.gz'
 
-    - name: Get hdf4 release osx12
+    - name: Get hdf4 snapshot osx12
       continue-on-error: true
       if: ${{ (inputs.use_environ == 'snapshots') }}
       uses: dsaltares/fetch-gh-release-asset@master
@@ -489,7 +508,7 @@ jobs:
         version: 'tags/${{ inputs.use_hdf5 }}'
         file: '${{ inputs.name_hdf5 }}-osx12.tar.gz'
 
-    - name: Get hdf5 release
+    - name: Get hdf5 snapshot
       continue-on-error: true
       if: ${{ (inputs.use_environ == 'snapshots') }}
       uses: dsaltares/fetch-gh-release-asset@master
@@ -498,7 +517,7 @@ jobs:
         version: 'tags/snapshot'
         file: '${{ inputs.name_hdf5 }}-osx.tar.gz'
 
-    - name: Get hdf5 release osx12
+    - name: Get hdf5 snapshot osx12
       continue-on-error: true
       if: ${{ (inputs.use_environ == 'snapshots') }}
       uses: dsaltares/fetch-gh-release-asset@master
@@ -571,7 +590,7 @@ jobs:
         NOTARY_KEY: ${{ vars.NOTARY_KEY }}
       run: ant -noinput -buildfile build.xml binaryAppPackage
 
-    - name: Rename snapshot binary base name
+    - name: Rename snapshot binary-app base name
       id: ren-basename
       if: ${{ (inputs.use_environ == 'snapshots') }}
       run: |
@@ -585,12 +604,22 @@ jobs:
             ls -l ${{ runner.workspace }}
 
     # Save files created by ctest script
-    - name: Save published App-binary (mac)
+    - name: Save published snapshot-app binary (mac)
       uses: actions/upload-artifact@v4
       with:
             name: tgz-osx-app-binary
             path: ${{ github.workspace }}/build/dist/${{ steps.set-file-base.outputs.FILE_BASE }}App-Darwin.tar.gz
             if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+
+    # Save release files created by ctest script
+    - name: Save published release-app binary (mac)
+      uses: actions/upload-artifact@v4
+      with:
+            name: tgz-osx-app-binary
+            path: ${{ github.workspace }}/build/dist/${{ inputs.snap_name }}App-Darwin.tar.gz
+            if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'release') }}
 
     - name: Test with Ant
       env:
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 6a259629..0009fdac 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -221,6 +221,16 @@ jobs:
             name: zip-win-vs2022-binary
             path: ${{ github.workspace }}/build/dist/${{ steps.set-file-base.outputs.FILE_BASE }}-win64.zip
             if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+
+    # Save release files created by ctest script
+    - name: Save published release binary (Win)
+      uses: actions/upload-artifact@v4
+      with:
+            name: zip-win-vs2022-binary
+            path: ${{ github.workspace }}/build/dist/${{ inputs.snap_name }}-win64.zip
+            if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'release') }}
 
     - name: Test with Ant
       env:
@@ -367,12 +377,21 @@ jobs:
             ls -l ${{ runner.workspace }}
 
     # Save files created by ctest script
-    - name: Save published binary (Linux)
+    - name: Save published snapshot binary (Linux)
       uses: actions/upload-artifact@v4
       with:
             name: tgz-ubuntu-2204-binary
             path: ${{ github.workspace }}/build/dist/${{ steps.set-file-base.outputs.FILE_BASE }}-Linux-x86_64.tar.gz
             if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+
+    - name: Save published release binary (Linux)
+      uses: actions/upload-artifact@v4
+      with:
+            name: tgz-ubuntu-2204-binary
+            path: ${{ github.workspace }}/build/dist/${{ inputs.snap_name }}-Linux-x86_64.tar.gz
+            if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'release') }}
 
     - name: Test with Ant
       env:
@@ -433,7 +452,7 @@ jobs:
         version: 'tags/${{ inputs.use_hdf }}'
         file: '${{ inputs.use_hdf }}-osx12.tar.gz'
 
-    - name: Get hdf4 release
+    - name: Get hdf4 snapshot
       continue-on-error: true
       if: ${{ (inputs.use_environ == 'snapshots') }}
       uses: dsaltares/fetch-gh-release-asset@master
@@ -442,7 +461,7 @@ jobs:
         version: 'tags/snapshot'
         file: '${{ inputs.use_hdf }}-osx.tar.gz'
 
-    - name: Get hdf4 release osx12
+    - name: Get hdf4 snapshot osx12
       continue-on-error: true
       if: ${{ (inputs.use_environ == 'snapshots') }}
       uses: dsaltares/fetch-gh-release-asset@master
@@ -489,7 +508,7 @@ jobs:
         version: 'tags/${{ inputs.use_hdf5 }}'
         file: '${{ inputs.name_hdf5 }}-osx12.tar.gz'
 
-    - name: Get hdf5 release
+    - name: Get hdf5 snapshot
       continue-on-error: true
       if: ${{ (inputs.use_environ == 'snapshots') }}
       uses: dsaltares/fetch-gh-release-asset@master
@@ -498,7 +517,7 @@ jobs:
         version: 'tags/snapshot'
         file: '${{ inputs.name_hdf5 }}-osx.tar.gz'
 
-    - name: Get hdf5 release osx12
+    - name: Get hdf5 snapshot osx12
       continue-on-error: true
       if: ${{ (inputs.use_environ == 'snapshots') }}
       uses: dsaltares/fetch-gh-release-asset@master
@@ -585,12 +604,22 @@ jobs:
             ls -l ${{ runner.workspace }}
 
     # Save files created by ctest script
-    - name: Save published binary (mac)
+    - name: Save published snapshot binary (mac)
       uses: actions/upload-artifact@v4
       with:
             name: tgz-osx-binary
             path: ${{ github.workspace }}/build/dist/${{ steps.set-file-base.outputs.FILE_BASE }}-Darwin.tar.gz
             if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+
+    # Save release files created by ctest script
+    - name: Save published release binary (mac)
+      uses: actions/upload-artifact@v4
+      with:
+            name: tgz-osx-binary
+            path: ${{ github.workspace }}/build/dist/${{ inputs.snap_name }}-Darwin.tar.gz
+            if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+      if: ${{ (inputs.use_environ == 'release') }}
 
     - name: Test with Ant
       env: