Skip to content

Commit

Permalink
Adjust and update steps (#263)
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF authored Jun 2, 2024
1 parent 9825705 commit 98dee72
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 47 deletions.
42 changes: 21 additions & 21 deletions .github/workflows/ant-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,20 @@ jobs:
uses: ilammy/[email protected]

- name: Get hdf4 release
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip'
if: ${{ (inputs.use_environ == 'release') }}

- 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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Uncompress gh binary (Win)
run: 7z x ${{ github.workspace }}/${{ inputs.use_hdf }}-win-vs2022_cl.zip
Expand Down Expand Up @@ -106,20 +106,20 @@ jobs:
shell: bash

- name: Get hdf5 release
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/${{ inputs.use_hdf5 }}'
file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 snapshot
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Uncompress gh binary (Win)
run: 7z x ${{ github.workspace }}/${{ inputs.name_hdf5 }}-win-vs2022_cl.zip
Expand Down Expand Up @@ -253,20 +253,20 @@ jobs:
distribution: 'temurin'

- name: Get hdf4 release
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: '${{ inputs.use_hdf }}'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- 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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (Linux)
run: |
Expand All @@ -289,20 +289,20 @@ jobs:
echo "HDFLIB_ENV=$HDFDIR$FILE_NAME_HDF" >> $GITHUB_OUTPUT
- name: Get hdf5 release
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/${{ inputs.use_hdf5 }}'
file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 release
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (Linux)
run: |
Expand Down Expand Up @@ -436,39 +436,39 @@ jobs:

- name: Get hdf4 release
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: '${{ inputs.use_hdf }}'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-osx.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf4 release osx12
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: '${{ inputs.use_hdf }}'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-osx12.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf4 snapshot
- 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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Get hdf4 snapshot 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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (mac)
run: |
Expand All @@ -492,39 +492,39 @@ jobs:
- name: Get hdf5 release
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/${{ inputs.use_hdf5 }}'
file: '${{ inputs.name_hdf5 }}-osx.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 release osx12
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'releases/tag/hdf5_1.14.4.3'
file: '${{ inputs.name_hdf5 }}-osx12.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 snapshot
continue-on-error: true
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: '${{ inputs.name_hdf5 }}-osx.tar.gz'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Get hdf5 snapshot osx12
continue-on-error: true
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
version: 'tags/snapshot'
file: '${{ inputs.name_hdf5 }}-osx12.tar.gz'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (mac)
run: |
Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,21 @@ jobs:
- name: Enable Developer Command Prompt
uses: ilammy/[email protected]

- name: Get hdf4 release
- name: Get hdf4 snapshot
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-win-vs2022_cl.zip'
if: ${{ (inputs.use_environ == 'release') }}

- 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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Uncompress gh binary (Win)
run: 7z x ${{ github.workspace }}/${{ inputs.use_hdf }}-win-vs2022_cl.zip
Expand Down Expand Up @@ -105,21 +105,21 @@ jobs:
echo "HDFLIB_ENV=$HDFDIR" >> $GITHUB_OUTPUT
shell: bash

- name: Get hdf5 release
- name: Get hdf5 snapshot
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/${{ inputs.use_hdf5 }}'
file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 snapshot
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Uncompress gh binary (Win)
run: 7z x ${{ github.workspace }}/${{ inputs.name_hdf5 }}-win-vs2022_cl.zip
Expand Down Expand Up @@ -252,21 +252,21 @@ jobs:
java-version: '21'
distribution: 'temurin'

- name: Get hdf4 release
- name: Get hdf4 snapshot
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: '${{ inputs.use_hdf }}'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-ubuntu-2204_gcc.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- 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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (Linux)
run: |
Expand All @@ -289,20 +289,20 @@ jobs:
echo "HDFLIB_ENV=$HDFDIR$FILE_NAME_HDF" >> $GITHUB_OUTPUT
- name: Get hdf5 release
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/${{ inputs.use_hdf5 }}'
file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 release
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (Linux)
run: |
Expand Down Expand Up @@ -436,39 +436,39 @@ jobs:

- name: Get hdf4 release
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: '${{ inputs.use_hdf }}'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-osx.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf4 release osx12
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: '${{ inputs.use_hdf }}'
version: 'tags/${{ inputs.use_hdf }}'
file: '${{ inputs.use_hdf }}-osx12.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf4 snapshot
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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Get hdf4 snapshot 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'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (mac)
run: |
Expand All @@ -492,39 +492,39 @@ jobs:
- name: Get hdf5 release
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/${{ inputs.use_hdf5 }}'
file: '${{ inputs.name_hdf5 }}-osx.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 release osx12
continue-on-error: true
if: ${{ (inputs.use_environ == 'release') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'releases/tag/hdf5_1.14.4.3'
file: '${{ inputs.name_hdf5 }}-osx12.tar.gz'
if: ${{ (inputs.use_environ == 'release') }}

- name: Get hdf5 snapshot
continue-on-error: true
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: '${{ inputs.name_hdf5 }}-osx.tar.gz'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: Get hdf5 snapshot osx12
continue-on-error: true
if: ${{ (inputs.use_environ == 'snapshots') }}
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: '${{ inputs.name_hdf5 }}-osx12.tar.gz'
if: ${{ (inputs.use_environ == 'snapshots') }}

- name: List files for the space (mac)
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ jobs:
needs: [log-the-inputs, call-workflow-tarball]
uses: ./.github/workflows/ant.yml
with:
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 }}
name_hdf5: ${{ inputs.use_tag5 }}
file_base: ${{ needs.create-files-ant.outputs.file_base }}
name_hdf5: ${{ inputs.name_tag5 }}
snap_name: hdfview-${{ needs.call-workflow-tarball.outputs.source_base }}
use_environ: release
secrets:
Expand All @@ -74,10 +74,10 @@ jobs:
needs: [log-the-inputs, call-workflow-tarball]
uses: ./.github/workflows/ant-app.yml
with:
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 }}
name_hdf5: ${{ inputs.use_tag5 }}
file_base: ${{ needs.create-files-ant.outputs.file_base }}
name_hdf5: ${{ inputs.name_tag5 }}
snap_name: hdfview-${{ needs.call-workflow-tarball.outputs.source_base }}
use_environ: release
secrets:
Expand Down

0 comments on commit 98dee72

Please sign in to comment.