sync daily build CI with latest (#370)

HDFGroup · Jun 18, 2023 · 660a1fb · 660a1fb
1 parent 53307ed
commit 660a1fb
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 25 deletions.
diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml
@@ -112,7 +112,7 @@ jobs:
 
       - name: List files for the space (Linux)
         run: |
-              ls ${{ github.workspace }}
+              ls -l ${{ github.workspace }}
               ls ${{ runner.workspace }}
 
       - name: Uncompress source (Linux)
@@ -139,7 +139,7 @@ jobs:
       - name: List files in the space (Linux)
         run: |
               ls ${{ github.workspace }}
-              ls ${{ runner.workspace }}
+              ls -l ${{ runner.workspace }}
 
       # Save files created by ctest script
       - name: Save published binary (Linux)
@@ -205,7 +205,7 @@ jobs:
       - name: List files in the space (MacOS)
         run: |
               ls ${{ github.workspace }}
-              ls ${{ runner.workspace }}
+              ls -l ${{ runner.workspace }}
 
       # Save files created by ctest script
       - name: Save published binary (MacOS)

diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
@@ -6,6 +6,9 @@ on:
   schedule:
     - cron: "6 0 * * *"
 
+permissions:
+  contents: read
+
 # A workflow run is made up of one or more jobs that can run sequentially or
 # in parallel.
 jobs:
@@ -21,6 +24,8 @@ jobs:
 
   call-workflow-release:
     needs: [call-workflow-tarball, call-workflow-ctest]
+    permissions:
+      contents: write # In order to allow tag creation
     uses: ./.github/workflows/release.yml
     with:
       file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,6 +17,10 @@ on:
         required: true
         type: string
 
+# Minimal permissions to be inherited by any job that doesn't declare its own permissions
+permissions:
+  contents: read
+
 # Previous workflows must pass to get here so tag the commit that created the files
 jobs:
   create-tag:
@@ -45,8 +49,12 @@ jobs:
       - run: |
           echo "Tag already present: ${{ steps.tag_create.outputs.tag_exists }}"
 
-  getfiles:
+  PreRelease-getfiles:
     runs-on: ubuntu-latest
+    needs: create-tag
+    environment: snapshots
+    permissions:
+        contents: write
     steps:
       - name: Get file base name
         id: get-file-base
@@ -86,30 +94,30 @@ jobs:
               name: tgz-ubuntu-2204-binary
               path: ${{ github.workspace }}
 
-      # Get files used by release script
-
-  PreRelease:
-    runs-on: ubuntu-latest
-    needs: [create-tag, getfiles]
-    environment: snapshots
-    permissions:
-        contents: write
-    steps:
-      - name: Get file base name
-        id: get-file-base
-        run: |
-          FILE_NAME_BASE=$(echo "${{ inputs.file_base }}")
-          echo "FILE_BASE=$FILE_NAME_BASE" >> $GITHUB_OUTPUT
-
       - name: PreRelease tag
+        id: create_release
         uses: softprops/action-gh-release@v1
         with:
           tag_name: "snapshot"
           prerelease: true
           files: |
-              ${{ github.workspace }}/${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
-              ${{ github.workspace }}/${{ steps.get-file-base.outputs.FILE_BASE }}.zip
-              ${{ github.workspace }}/${{ steps.get-file-base.outputs.FILE_BASE }}-osx12.tar.gz
-              ${{ github.workspace }}/${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204.tar.gz
-              ${{ github.workspace }}/${{ steps.get-file-base.outputs.FILE_BASE }}-win_vs2022.zip
+              ${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
+              ${{ steps.get-file-base.outputs.FILE_BASE }}.zip
+              ${{ steps.get-file-base.outputs.FILE_BASE }}-osx12.tar.gz
+              ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204.tar.gz
+              ${{ steps.get-file-base.outputs.FILE_BASE }}-win_vs2022.zip
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
+
+      - name: Store Release url
+        run: |
+          echo "${{ steps.create_release.outputs.upload_url }}" > ./upload_url
+
+#      - uses: actions/upload-artifact@v3
+#        with:
+#          path: ./upload_url
+#          name: upload_url
+
+      - name: List files for the space (Linux)
+        run: |
+              ls -l ${{ github.workspace }}
+              ls ${{ runner.workspace }}
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
@@ -95,7 +95,7 @@ jobs:
 
       - name: List files in the repository
         run: |
-              ls ${{ github.workspace }}
+              ls -l ${{ github.workspace }}
               ls $GITHUB_WORKSPACE
 
       # Save files created by release script