Fix vercel deployment

StefMa · Mar 3, 2023 · 814f747 · 814f747
1 parent 488276c
commit 814f747
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 18 deletions.
diff --git a/.github/workflows/fresh-to-vercel-pr-deployment.yml b/.github/workflows/fresh-to-vercel-pr-deployment.yml
@@ -14,21 +14,53 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download hugo build
-        uses: actions/download-artifact@v3
+        uses: actions/[email protected]
         with:
-          name: hugo-output
-          path: public/
+          script: |
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{ github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "hugo-output"
+            })[0];
+            var download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/hugo-output.zip', Buffer.from(download.data));
+      - run: unzip hugo-output.zip -d hugo-output
 
-      - name: Download alias-domain 
-        uses: actions/download-artifact@v3
+      - name: Download alias-domain
+        uses: actions/[email protected]
         with:
-          name: alias-domain
-          path: alias-domain
+          script: |
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{ github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "alias-domain"
+            })[0];
+            var download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/alias-domain.zip', Buffer.from(download.data));
+      - run: unzip alias-domain.zip
 
       - name: Extract alias-domain
         id: extract-alias-domain
         run: |
-          aliasDomain=`cat alias-domain/alias-domain`
+          aliasDomain=`cat alias-domain`
           echo "ALIAS_DOMAIN=$aliasDomain" >> $GITHUB_OUTPUT
 
       - name: Deploy to Vercel on PR
@@ -37,5 +69,6 @@ jobs:
           vercel-token: ${{ secrets.VERCEL_TOKEN }} 
           vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} 
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}}
-          alias-domains: ${{ steps.extract-alias-domain.outputs.ALIAS_DOMAIN }}"
-          working-directory: ./public
+          vercel-project-name: hugo-fresh
+          alias-domains: ${{ steps.extract-alias-domain.outputs.ALIAS_DOMAIN }}
+          working-directory: ./hugo-output
diff --git a/.github/workflows/fresh-to-vercel-pr.yml b/.github/workflows/fresh-to-vercel-pr.yml
@@ -19,14 +19,9 @@ jobs:
       - name: Build with Hugo on PR
         working-directory: exampleSite
         run: |
-          git clone https://github.com/StefMa/hugo-fresh themes/hugo-fresh
-          cd themes/hugo-fresh
-          git fetch origin ${{ github.ref }}:pr-branch-name
-          git checkout pr-branch-name
-          cd ../..
           hugo \
             --minify \
-            --baseURL https://hugo-fresh-${{ github.run_number }}.vercel.app
+            --baseURL https://hugo-fresh-${{ github.event.pull_request.head.user.login }}-${{ github.event.pull_request.head.ref }}.vercel.app
 
       - name: Save hugo as artifact
         uses: actions/upload-artifact@v3
@@ -37,7 +32,7 @@ jobs:
       - name: Save alias domain
         run: |
           mkdir -p ./alias-domain
-          echo https://hugo-fresh-${{ github.run_number }}.vercel.app > ./alias-domain/alias-domain
+          echo hugo-fresh-${{ github.event.pull_request.head.user.login }}-${{ github.event.pull_request.head.ref }}.vercel.app > ./alias-domain/alias-domain
 
       - name: Save alias domain as artifact
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/fresh-to-vercel.yml b/.github/workflows/fresh-to-vercel.yml
@@ -21,7 +21,6 @@ jobs:
       - name: Build with Hugo on master
         working-directory: exampleSite
         run: |
-          git clone https://github.com/StefMa/hugo-fresh themes/hugo-fresh
           hugo \
             --minify \
             --baseURL https://hugo-fresh.vercel.app/
@@ -32,5 +31,6 @@ jobs:
           vercel-token: ${{ secrets.VERCEL_TOKEN }} 
           vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} 
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}}
+          vercel-project-name: hugo-fresh
           vercel-args: '--prod'
           working-directory: ./exampleSite/public