From 40a1231e43611c29280a8de601f29e7c324ce581 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 31 May 2024 14:49:54 -0500 Subject: [PATCH 1/3] Correct hdf5 usage --- .github/workflows/ant-app.yml | 21 +++++++++++++++++++++ .github/workflows/ant.yml | 22 ---------------------- .github/workflows/release.yml | 18 ------------------ 3 files changed, 21 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml index d49c6289..49d4aea8 100644 --- a/.github/workflows/ant-app.yml +++ b/.github/workflows/ant-app.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,8 @@ 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 @@ -126,7 +129,11 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' +<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git version: 'tags/snapshot' +======= + version: 'tags/${{ inputs.use_hdf5 }}' +>>>>>>> ca2a79d Correct hdf5 usage file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip' - name: Uncompress gh binary (Win) @@ -256,6 +263,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 @@ -264,6 +272,8 @@ 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 @@ -307,7 +317,11 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' +<<<<<<< Upstream, based on branch 'master' of https://github.com/byrnHDF/hdfview.git version: 'tags/snapshot' +======= + version: 'tags/${{ inputs.use_hdf5 }}' +>>>>>>> ca2a79d Correct hdf5 usage file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz' - name: List files for the space (Linux) @@ -447,6 +461,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 }}-osx12.tar.gz' - name: Get hdf4 release @@ -465,6 +480,8 @@ jobs: with: repo: 'HDFGroup/hdf4' version: 'tags/${{ inputs.use_hdf }}' +======= +>>>>>>> ca2a79d Correct hdf5 usage file: '${{ inputs.use_hdf }}-osx12.tar.gz' - name: Get hdf4 release @@ -529,6 +546,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 version: 'tags/snapshot' file: '${{ inputs.name_hdf5 }}-osx.tar.gz' @@ -539,6 +557,9 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot' +======= + version: 'tags/${{ inputs.use_hdf5 }}' +>>>>>>> ca2a79d Correct hdf5 usage file: '${{ inputs.name_hdf5 }}-osx12.tar.gz' - name: List files for the space (mac) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index f2daa91f..814f18bf 100644 --- 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,6 @@ 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 @@ -129,15 +126,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 +256,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 +264,6 @@ 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 @@ -321,15 +307,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) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fafca78f..3bae3b9b 100644 --- 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: From 17e7daed458c372f5f43551477b3d0c5ca856ac2 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Sun, 2 Jun 2024 14:49:52 -0500 Subject: [PATCH 2/3] Correct get hdf4/5 binaries --- .github/workflows/ant-app.yml | 21 +++++++++++++++++++++ .github/workflows/ant.yml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml index 49d4aea8..18186402 100644 --- a/.github/workflows/ant-app.yml +++ b/.github/workflows/ant-app.yml @@ -129,11 +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) @@ -317,11 +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) @@ -546,6 +554,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' file: '${{ inputs.name_hdf5 }}-osx.tar.gz' @@ -560,6 +569,18 @@ jobs: ======= version: 'tags/${{ inputs.use_hdf5 }}' >>>>>>> ca2a79d Correct hdf5 usage +======= + version: 'tags/snapshot' + file: '${{ inputs.name_hdf5 }}-osx.tar.gz' + + - name: Get hdf5 release osx12 + continue-on-error: true + if: ${{ (inputs.use_environ == 'snapshots') }} + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'HDFGroup/hdf5' + version: 'tags/snapshot' +>>>>>>> ba9303e Correct get hdf4/5 binaries file: '${{ inputs.name_hdf5 }}-osx12.tar.gz' - name: List files for the space (mac) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 814f18bf..cd7b2e38 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -83,6 +83,14 @@ jobs: version: 'tags/snapshot' 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 @@ -274,6 +282,14 @@ jobs: version: 'tags/snapshot' 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 }} @@ -485,6 +501,24 @@ jobs: version: 'tags/snapshot' 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 }} From 8875c653aa9b95ef4a3afd729c693dde7f54cb85 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Sun, 2 Jun 2024 14:57:08 -0500 Subject: [PATCH 3/3] Merge fix --- .github/workflows/ant-app.yml | 42 ----------------------------------- .github/workflows/ant.yml | 3 +++ 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml index 18186402..d49c6289 100644 --- a/.github/workflows/ant-app.yml +++ b/.github/workflows/ant-app.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,6 @@ 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 @@ -129,15 +126,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 +256,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 +264,6 @@ 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 @@ -321,15 +307,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) @@ -469,7 +447,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 }}-osx12.tar.gz' - name: Get hdf4 release @@ -488,8 +465,6 @@ jobs: with: repo: 'HDFGroup/hdf4' version: 'tags/${{ inputs.use_hdf }}' -======= ->>>>>>> ca2a79d Correct hdf5 usage file: '${{ inputs.use_hdf }}-osx12.tar.gz' - name: Get hdf4 release @@ -554,22 +529,6 @@ 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' - file: '${{ inputs.name_hdf5 }}-osx.tar.gz' - - - name: Get hdf5 release osx12 - continue-on-error: true - if: ${{ (inputs.use_environ == 'snapshots') }} - uses: dsaltares/fetch-gh-release-asset@master - with: - repo: 'HDFGroup/hdf5' - version: 'tags/snapshot' -======= - version: 'tags/${{ inputs.use_hdf5 }}' ->>>>>>> ca2a79d Correct hdf5 usage -======= version: 'tags/snapshot' file: '${{ inputs.name_hdf5 }}-osx.tar.gz' @@ -580,7 +539,6 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot' ->>>>>>> ba9303e Correct get hdf4/5 binaries file: '${{ inputs.name_hdf5 }}-osx12.tar.gz' - name: List files for the space (mac) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index cd7b2e38..d14bbcaf 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -481,6 +481,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 }}-osx12.tar.gz' - name: Get hdf4 release @@ -499,6 +500,8 @@ jobs: with: repo: 'HDFGroup/hdf4' version: 'tags/snapshot' +======= +>>>>>>> 8ee157e Merge fix file: '${{ inputs.use_hdf }}-osx12.tar.gz' - name: Get hdf4 release