Merge cleanup (#259)

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

Hide file tree

Showing 2 changed files with 37 additions and 40 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -65,7 +65,6 @@ 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
@@ -74,8 +73,14 @@ 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: Get hdf4 snapshot
@@ -129,15 +134,7 @@ 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)
@@ -267,7 +264,6 @@ 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
@@ -276,8 +272,14 @@ 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: Get hdf4 snapshot
@@ -321,15 +323,7 @@ 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)
@@ -487,6 +481,27 @@ 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 }}-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'
+=======
+>>>>>>> 8ee157e Merge fix
         file: '${{ inputs.use_hdf }}-osx12.tar.gz'
 
     - name: Get hdf4 release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,16 +62,7 @@ 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:      
@@ -86,16 +77,7 @@ 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: