From 3b9ac71ed5ecfb47b87aa1602736db2082f6570f Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Fri, 31 May 2024 09:09:43 -0500 Subject: [PATCH 1/3] Correct version processing (#252) --- .github/workflows/tarball.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml index 47f2f61d..ac017ed5 100644 --- a/.github/workflows/tarball.yml +++ b/.github/workflows/tarball.yml @@ -98,11 +98,15 @@ jobs: with: path: hdfsrc + - name: Read VERSION file + id: getversion + run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT + - name: Retrieve version id: version run: | cd "$GITHUB_WORKSPACE/hdfsrc" - VERSION_BASE=$(echo VERSION | sed -r "s/.*-([0-9]+\.[0-9]+\.[0-9]+).*/\1/") + VERSION_BASE=$(echo "${{ steps.getversion.outputs.version }}" | sed -r "s/.*-([0-9]+\.[0-9]+\.[0-9]+).*/\1/") echo "TAG_VERSION=$VERSION_BASE" >> $GITHUB_OUTPUT - name: Set file base name From e0095732b6133d285d4ba9abc99a53a7a7dd2912 Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Fri, 31 May 2024 09:42:35 -0500 Subject: [PATCH 2/3] Fix tag usage (#253) * Correct version processing * Fix issue with tags vs names --- .github/workflows/ant-app.yml | 36 +++++++++++++++--------------- .github/workflows/ant.yml | 42 +++++++++++++++++++---------------- .github/workflows/release.yml | 7 +++++- 3 files changed, 47 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml index c884df29..5a8083c5 100644 --- a/.github/workflows/ant-app.yml +++ b/.github/workflows/ant-app.yml @@ -59,7 +59,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: '${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip' if: ${{ (inputs.use_environ == 'release') }} @@ -105,8 +105,8 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-win-vs2022_cl.zip' + version: 'tags/${{ inputs.use_hdf5 }}' + file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 snapshot @@ -114,11 +114,11 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-win-vs2022_cl.zip' + file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip' if: ${{ (inputs.use_environ == 'snapshots') }} - name: Uncompress gh binary (Win) - run: 7z x ${{ github.workspace }}/${{ inputs.use_hdf5 }}-win-vs2022_cl.zip + run: 7z x ${{ github.workspace }}/${{ inputs.name_hdf5 }}-win-vs2022_cl.zip - name: Uncompress hdf5 binary (Win) working-directory: ${{ github.workspace }}/hdf5 @@ -252,7 +252,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: '${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz' if: ${{ (inputs.use_environ == 'release') }} @@ -288,8 +288,8 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-ubuntu-2204_gcc.tar.gz' + version: 'tags/${{ inputs.use_hdf5 }}' + file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 release @@ -297,7 +297,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-ubuntu-2204_gcc.tar.gz' + file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz' if: ${{ (inputs.use_environ == 'snapshots') }} - name: List files for the space (Linux) @@ -306,7 +306,7 @@ jobs: ls ${{ runner.workspace }} - name: Uncompress gh binary (Linux) - run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-ubuntu-2204_gcc.tar.gz + run: tar -zxvf ${{ github.workspace }}/${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz - name: Uncompress hdf5 binary (Linux) run: | @@ -435,7 +435,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: '${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-osx.tar.gz' if: ${{ (inputs.use_environ == 'release') }} @@ -444,7 +444,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: '${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-osx12.tar.gz' if: ${{ (inputs.use_environ == 'release') }} @@ -491,8 +491,8 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-osx.tar.gz' + version: 'tags/${{ inputs.use_hdf5 }}' + file: '${{ inputs.name_hdf5 }}-osx.tar.gz' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 release osx12 @@ -501,7 +501,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-osx12.tar.gz' + file: '${{ inputs.name_hdf5 }}-osx12.tar.gz' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 snapshot @@ -510,7 +510,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-osx.tar.gz' + file: '${{ inputs.name_hdf5 }}-osx.tar.gz' if: ${{ (inputs.use_environ == 'snapshots') }} - name: Get hdf5 snapshot osx12 @@ -519,7 +519,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-osx12.tar.gz' + file: '${{ inputs.name_hdf5 }}-osx12.tar.gz' if: ${{ (inputs.use_environ == 'snapshots') }} - name: List files for the space (mac) @@ -528,7 +528,7 @@ jobs: ls ${{ runner.workspace }} - name: Uncompress gh binary (mac) - run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-osx*.tar.gz + run: tar -zxvf ${{ github.workspace }}/${{ inputs.name_hdf5 }}-osx*.tar.gz - name: Uncompress hdf5 binary (mac) run: | diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 191c0b4f..7e0aca19 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -5,10 +5,14 @@ on: workflow_call: inputs: use_hdf: - description: "The hdf4 base name of the binaries" + description: "The hdf4 tag base name of the binaries" required: true type: string use_hdf5: + description: "The hdf5 tag name of the binaries" + required: true + type: string + name_hdf5: description: "The hdf5 base name of the binaries" required: true type: string @@ -59,7 +63,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: 'tags/${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip' if: ${{ (inputs.use_environ == 'release') }} @@ -105,8 +109,8 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-win-vs2022_cl.zip' + version: 'tags/${{ inputs.use_hdf5 }}' + file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 snapshot @@ -114,11 +118,11 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-win-vs2022_cl.zip' + file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip' if: ${{ (inputs.use_environ == 'snapshots') }} - name: Uncompress gh binary (Win) - run: 7z x ${{ github.workspace }}/${{ inputs.use_hdf5 }}-win-vs2022_cl.zip + run: 7z x ${{ github.workspace }}/${{ inputs.name_hdf5 }}-win-vs2022_cl.zip - name: Uncompress hdf5 binary (Win) working-directory: ${{ github.workspace }}/hdf5 @@ -252,7 +256,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: '${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz' if: ${{ (inputs.use_environ == 'release') }} @@ -288,8 +292,8 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-ubuntu-2204_gcc.tar.gz' + version: 'tags${{ inputs.use_hdf5 }}' + file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 release @@ -297,7 +301,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-ubuntu-2204_gcc.tar.gz' + file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz' if: ${{ (inputs.use_environ == 'snapshots') }} - name: List files for the space (Linux) @@ -306,7 +310,7 @@ jobs: ls ${{ runner.workspace }} - name: Uncompress gh binary (Linux) - run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-ubuntu-2204_gcc.tar.gz + run: tar -zxvf ${{ github.workspace }}/${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz - name: Uncompress hdf5 binary (Linux) run: | @@ -435,7 +439,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: '${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-osx.tar.gz' if: ${{ (inputs.use_environ == 'release') }} @@ -444,7 +448,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: 'hdf4.3.0' + version: '${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-osx12.tar.gz' if: ${{ (inputs.use_environ == 'release') }} @@ -491,8 +495,8 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-osx.tar.gz' + version: 'tag/${{ inputs.use_hdf5 }}' + file: '${{ inputs.name_hdf5 }}-osx.tar.gz' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 release osx12 @@ -501,7 +505,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'releases/tag/hdf5_1.14.4.3' - file: '${{ inputs.use_hdf5 }}-osx12.tar.gz' + file: '${{ inputs.name_hdf5 }}-osx12.tar.gz' if: ${{ (inputs.use_environ == 'release') }} - name: Get hdf5 snapshot @@ -510,7 +514,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-osx.tar.gz' + file: '${{ inputs.name_hdf5 }}-osx.tar.gz' if: ${{ (inputs.use_environ == 'snapshots') }} - name: Get hdf5 snapshot osx12 @@ -519,7 +523,7 @@ jobs: with: repo: 'HDFGroup/hdf5' version: 'tags/snapshot-1.14' - file: '${{ inputs.use_hdf5 }}-osx12.tar.gz' + file: '${{ inputs.name_hdf5 }}-osx12.tar.gz' if: ${{ (inputs.use_environ == 'snapshots') }} - name: List files for the space (mac) @@ -528,7 +532,7 @@ jobs: ls ${{ runner.workspace }} - name: Uncompress gh binary (mac) - run: tar -zxvf ${{ github.workspace }}/${{ inputs.use_hdf5 }}-osx*.tar.gz + run: tar -zxvf ${{ github.workspace }}/${{ inputs.name_hdf5 }}-osx*.tar.gz - name: Uncompress hdf5 binary (mac) run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a6a3da1..dcdab199 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,12 @@ on: description: 'HDF5 Release version tag' type: string required: false - default: hdf5_1.14.4.3' + default: hdf5_1.14.4.3 + use_tag5: + description: 'HDF5 Release version base name' + type: string + required: false + default: hdf5-1.14.4-3 permissions: contents: read From 9466111011259e5d49c237a67589afa44bb51e5c Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Fri, 31 May 2024 09:55:48 -0500 Subject: [PATCH 3/3] Fix typos (#254) * Correct version processing * Fix issue with tags vs names --- .github/workflows/ant-app.yml | 8 ++++++-- .github/workflows/ant.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml index 5a8083c5..f7b39087 100644 --- a/.github/workflows/ant-app.yml +++ b/.github/workflows/ant-app.yml @@ -5,10 +5,14 @@ on: workflow_call: inputs: use_hdf: - description: "The hdf4 base name of the binaries" + description: "The hdf4 tag and base name of the binaries" required: true type: string use_hdf5: + description: "The hdf5 tag name of the binaries" + required: true + type: string + name_hdf5: description: "The hdf5 base name of the binaries" required: true type: string @@ -59,7 +63,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf4' - version: '${{ inputs.use_hdf }}' + version: 'tags/${{ inputs.use_hdf }}' file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip' if: ${{ (inputs.use_environ == 'release') }} diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 7e0aca19..a6960688 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -5,7 +5,7 @@ on: workflow_call: inputs: use_hdf: - description: "The hdf4 tag base name of the binaries" + description: "The hdf4 tag and base name of the binaries" required: true type: string use_hdf5: @@ -292,7 +292,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'tags${{ inputs.use_hdf5 }}' + version: 'tags/${{ inputs.use_hdf5 }}' file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz' if: ${{ (inputs.use_environ == 'release') }} @@ -495,7 +495,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@master with: repo: 'HDFGroup/hdf5' - version: 'tag/${{ inputs.use_hdf5 }}' + version: 'tags/${{ inputs.use_hdf5 }}' file: '${{ inputs.name_hdf5 }}-osx.tar.gz' if: ${{ (inputs.use_environ == 'release') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dcdab199..0aaa0bdc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: required: false default: snapshot use_tag4: - description: 'HDF Release version tag' + description: 'HDF Release version tag and base name' type: string required: false default: hdf4.3.0 @@ -18,7 +18,7 @@ on: type: string required: false default: hdf5_1.14.4.3 - use_tag5: + name_tag5: description: 'HDF5 Release version base name' type: string required: false