Merge fixes (#258)

HDFGroup · Jun 2, 2024 · 13c983d · 13c983d
1 parent 0d424c3
commit 13c983d
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 0 deletions.
diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
@@ -75,6 +75,14 @@ jobs:
         version: 'tags/${{ inputs.use_hdf }}'
         file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip'
 
+    - name: Get hdf4 snapshot
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip'
+
     - name: Uncompress gh binary (Win)
       run: 7z x ${{ github.workspace }}/${{ inputs.use_hdf }}-win-vs2022_cl.zip
 
@@ -258,6 +266,14 @@ jobs:
         version: 'tags/${{ inputs.use_hdf }}'
         file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz'
 
+    - name: Get hdf4 snapshot
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz'
+
     - name: List files for the space (Linux)
       run: |
             ls -l ${{ github.workspace }}
@@ -451,6 +467,24 @@ jobs:
         version: 'tags/${{ inputs.use_hdf }}'
         file: '${{ inputs.use_hdf }}-osx12.tar.gz'
 
+    - name: Get hdf4 release
+      continue-on-error: true
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-osx.tar.gz'
+
+    - name: Get hdf4 release osx12
+      continue-on-error: true
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-osx12.tar.gz'
+
     - name: List files for the space (mac)
       run: |
             ls -l ${{ github.workspace }}

diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -65,6 +65,7 @@ jobs:
       with:
         repo: 'HDFGroup/hdf4'
         version: 'tags/${{ inputs.use_hdf }}'
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
         file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip'
 
     - name: Get hdf4 snapshot
@@ -73,6 +74,16 @@ jobs:
       with:
         repo: 'HDFGroup/hdf4'
         version: 'tags/${{ inputs.use_hdf }}'
+=======
+>>>>>>> ca2a79d Correct hdf5 usage
+        file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip'
+
+    - name: Get hdf4 snapshot
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
         file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip'
 
     - name: Uncompress gh binary (Win)
@@ -118,7 +129,15 @@ jobs:
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf5'
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
+        version: 'tags/snapshot'
+=======
+        version: 'tags/${{ inputs.use_hdf5 }}'
+>>>>>>> ca2a79d Correct hdf5 usage
+=======
         version: 'tags/snapshot'
+>>>>>>> ba9303e Correct get hdf4/5 binaries
         file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip'
 
     - name: Uncompress gh binary (Win)
@@ -248,6 +267,7 @@ jobs:
       with:
         repo: 'HDFGroup/hdf4'
         version: 'tags/${{ inputs.use_hdf }}'
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
         file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz'
 
     - name: Get hdf4 snapshot
@@ -256,6 +276,16 @@ jobs:
       with:
         repo: 'HDFGroup/hdf4'
         version: 'tags/${{ inputs.use_hdf }}'
+=======
+>>>>>>> ca2a79d Correct hdf5 usage
+        file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz'
+
+    - name: Get hdf4 snapshot
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
         file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz'
 
     - name: List files for the space (Linux)
@@ -291,7 +321,15 @@ jobs:
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: 'HDFGroup/hdf5'
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
+        version: 'tags/snapshot'
+=======
+        version: 'tags/${{ inputs.use_hdf5 }}'
+>>>>>>> ca2a79d Correct hdf5 usage
+=======
         version: 'tags/snapshot'
+>>>>>>> ba9303e Correct get hdf4/5 binaries
         file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz'
 
     - name: List files for the space (Linux)
@@ -451,6 +489,24 @@ jobs:
         version: 'tags/${{ inputs.use_hdf }}'
         file: '${{ inputs.use_hdf }}-osx12.tar.gz'
 
+    - name: Get hdf4 release
+      continue-on-error: true
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-osx.tar.gz'
+
+    - name: Get hdf4 release osx12
+      continue-on-error: true
+      if: ${{ (inputs.use_environ == 'snapshots') }}
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: 'HDFGroup/hdf4'
+        version: 'tags/snapshot'
+        file: '${{ inputs.use_hdf }}-osx12.tar.gz'
+
     - name: List files for the space (mac)
       run: |
             ls -l ${{ github.workspace }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,7 +62,16 @@ jobs:
       file_base: ${{ needs.create-files-ant.outputs.file_base }}
       use_hdf: ${{ needs.log-the-inputs.outputs.rel4_tag }}
       use_hdf5: ${{ needs.log-the-inputs.outputs.rel5_tag }}
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
       name_hdf5: ${{ inputs.name_tag5 }}
+=======
+      name_hdf5: ${{ inputs.use_tag5 }}
+      file_base: ${{ needs.create-files-ant.outputs.file_base }}
+>>>>>>> ca2a79d Correct hdf5 usage
+=======
+      name_hdf5: ${{ inputs.name_tag5 }}
+>>>>>>> ba9303e Correct get hdf4/5 binaries
       snap_name: hdfview-${{ needs.call-workflow-tarball.outputs.source_base }}
       use_environ: release
     secrets:      
@@ -77,7 +86,16 @@ jobs:
       file_base: ${{ needs.create-files-ant.outputs.file_base }}
       use_hdf: ${{ needs.log-the-inputs.outputs.rel4_tag }}
       use_hdf5: ${{ needs.log-the-inputs.outputs.rel5_tag }}
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
+<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git
+      name_hdf5: ${{ inputs.name_tag5 }}
+=======
+      name_hdf5: ${{ inputs.use_tag5 }}
+      file_base: ${{ needs.create-files-ant.outputs.file_base }}
+>>>>>>> ca2a79d Correct hdf5 usage
+=======
       name_hdf5: ${{ inputs.name_tag5 }}
+>>>>>>> ba9303e Correct get hdf4/5 binaries
       snap_name: hdfview-${{ needs.call-workflow-tarball.outputs.source_base }}
       use_environ: release
     secrets: