Workflow update

emilevr · Nov 3, 2023 · 0c262b0 · 0c262b0
1 parent 00b0f72
commit 0c262b0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/.github/actions/package-windows/action.yaml b/.github/actions/package-windows/action.yaml
@@ -21,3 +21,9 @@ runs:
           -Target ${{ inputs.target }} `
           -ArchiveFileHash $env:ARCHIVE_FILE_HASH `
           -Version $env:CALCULATED_VERSION
+
+    - name: Upload pages artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: pages-${{ inputs.target }}
+        path: ./artifacts/pages
diff --git a/.github/actions/package-windows/update-scoop-manifest.ps1 b/.github/actions/package-windows/update-scoop-manifest.ps1
@@ -5,7 +5,7 @@ param(
     [Parameter(Mandatory=$true)][string]$Version
 )
 
-$artifactsDir = 'artifacts/dist/pages/scoop'
+$artifactsDir = 'artifacts/pages/scoop'
 $sourceTemplatePath = 'install/scoop/space.json'
 
 New-Item -Type Directory -Path $artifactsDir -Force | Out-Null

diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -160,15 +160,23 @@ jobs:
       url: https://emilevr.github.io/space
 
     steps:
-      - name: Fix permissions
+      - name: Download all workflow run artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Package pages artifacts
         run: |
-          chmod -c -R +rX "./artifacts/dist/pages/" | while read line; do
+          TARGET=dist-x86_64-pc-windows-msvc
+          TARGET_ARTIFACTS_DIR="./dist-${TARGET}"
+          PAGES_ARTIFACTS_DIR="${TARGET_ARTIFACTS_DIR}/pages"
+
+          ls $PAGES_ARTIFACTS_DIR -la
+
+          echo "Setting pages file permissions"
+          chmod -c -R +rX "${PAGES_ARTIFACTS_DIR}/" | while read line; do
             echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
 
-      - name: Compress pages
-        run: |
-          tar -C ./artifacts/dist/pages/ -czf github-pages
+          tar -C "${PAGES_ARTIFACTS_DIR}/" -czf github-pages
 
       - name: Upload Pages artifact
         uses: actions/upload-pages-artifact@v2