Merge pull request #35 from byrnHDF/master-ci-release

use hdf tag name instead of snapshot name to get hdf5
HDFGroup · Oct 18, 2023 · 9cdb607 · 9cdb607
2 parents 883621f + d04d8d8
commit 9cdb607
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml
@@ -12,6 +12,11 @@ on:
         description: "The common base name of the source tarballs"
         required: true
         type: string
+      use_environ:
+        description: 'Environment to locate files'
+        type: string
+        required: true
+        default: snapshots
 
 permissions:
   contents: read
@@ -40,14 +45,21 @@ jobs:
         uses: ilammy/[email protected]
 
       - name: Get hdf5 release
+        if: ${{ (inputs.use_environ == 'snapshots') }}
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: 'HDFGroup/hdf5'
-          #version: 'tags/1.14.2'
-          #file: 'hdf5-1_14_2-win_vs2022.zip'
           version: 'tags/snapshot'
           file: '${{ inputs.use_hdf }}-win_vs2022.zip'
 
+      - name: Get hdf5 release
+        if: ${{ (inputs.use_environ == 'release') }}
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: 'HDFGroup/hdf5'
+          version: 'tags/${{ inputs.use_hdf }}'
+          file: '${{ inputs.use_hdf }}-win_vs2022.zip'
+
       - name: Uncompress gh binary (Win)
         run: 7z x ${{ github.workspace }}/${{ inputs.use_hdf }}-win_vs2022.zip
 
@@ -138,14 +150,21 @@ jobs:
           distribution: 'temurin'
 
       - name: Get hdf5 release
+        if: ${{ (inputs.use_environ == 'snapshots') }}
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: 'HDFGroup/hdf5'
-          #version: 'tags/1.14.2'
-          #file: 'hdf5-1_14_2-ubuntu-2204.tar.gz'
           version: 'tags/snapshot'
           file: '${{ inputs.use_hdf }}-ubuntu-2204.tar.gz'
 
+      - name: Get hdf5 release
+        if: ${{ (inputs.use_environ == 'release') }}
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: 'HDFGroup/hdf5'
+          version: 'tags/${{ inputs.use_hdf }}'
+          file: '${{ inputs.use_hdf }}-ubuntu-2204.tar.gz'
+
       - name: List files for the space (Linux)
         run: |
             ls -l ${{ github.workspace }}
@@ -219,14 +238,21 @@ jobs:
           distribution: 'temurin'
 
       - name: Get hdf5 release
+        if: ${{ (inputs.use_environ == 'snapshots') }}
         uses: dsaltares/fetch-gh-release-asset@master
         with:
           repo: 'HDFGroup/hdf5'
-          #version: 'tags/1.14.2'
-          #file: 'hdf5-1_14_2-osx12.tar.gz'
           version: 'tags/snapshot'
           file: '${{ inputs.use_hdf }}-osx12.tar.gz'
 
+      - name: Get hdf5 release
+        if: ${{ (inputs.use_environ == 'release') }}
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: 'HDFGroup/hdf5'
+          version: 'tags/${{ inputs.use_hdf }}'
+          file: '${{ inputs.use_hdf }}-osx12.tar.gz'
+
       - name: List files for the space (MacOS)
         run: |
             ls -l ${{ github.workspace }}

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
@@ -71,8 +71,7 @@ jobs:
     with:
       file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
       use_hdf: ${{ needs.get-base-names.outputs.hdf5-name }}
-      #use_tag: snapshot
-      #use_environ: snapshots
+      use_environ: ${{ needs.get-base-names.outputs.run-environ }}
     if: ${{ ((needs.get-base-names.outputs.run-environ == 'snapshots') && ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore'))) || (needs.get-base-names.outputs.run-environ  == 'release') }}
 
   call-workflow-release:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       use_tag:
-        description: 'Release version tag'
+        description: 'Release hdf5 version tag'
         type: string
         required: false
         default: snapshot
@@ -85,6 +85,7 @@ jobs:
     with:
       use_hdf: ${{ needs.log-the-inputs.outputs.rel_tag }}
       file_base: ${{ needs.create-files-ctest.outputs.file_base }}
+      use_environ: release
 
   call-workflow-release:
     #needs: [call-workflow-tarball, call-workflow-ctest]