fix: link to test preview

hasadna · Feb 23, 2025 · d43c57c · d43c57c
1 parent d92aed9
commit d43c57c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 9 deletions.
diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml
@@ -10,6 +10,22 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Download pr-vars Artifact from Validate Workflow
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: 'Validate'
+          workflow_conclusion: success
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          name: pr-vars # Artifact name from Validate Workflow.
+          path: .
+
+      - name: Load Variables into Environment Variables
+        run: |
+          # Read variables from vars.env file.
+          export $(cat vars.env | xargs)
+          echo "Loaded PULL_REQUEST=$PULL_REQUEST"
+          echo "Loaded UNIQUE_ID=$UNIQUE_ID"
+
       - name: Download dist-build artifact
         uses: dawidd6/action-download-artifact@v6
         with:
@@ -59,7 +75,8 @@ jobs:
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws_bucket: noam-gaash.co.il
           source_dir: .  # Upload the root directory
-          destination_dir: ${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.run_number }}
+          destination_dir: $PULL_REQUEST/open-bus/$UNIQUE_ID
+          #destination_dir: ${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.run_number }}
 
       - name: find comment
         uses: peter-evans/find-comment@v1
@@ -77,16 +94,16 @@ jobs:
           comment-id: ${{ steps.fc.outputs.comment-id }}
           edit-mode: replace
           body: |
-            Preview: https://s3.amazonaws.com/noam-gaash.co.il/${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.run_number }}/index.html
-            Preview Storybook: https://s3.amazonaws.com/noam-gaash.co.il/${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.run_number }}/storybook/index.html
-            Test Report (if available): 'https://s3.amazonaws.com/noam-gaash.co.il/${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.head_sha }}/test-results/index.html'
+            Preview: https://s3.amazonaws.com/noam-gaash.co.il/$PULL_REQUEST/open-bus/$UNIQUE_ID/index.html
+            Preview Storybook: https://s3.amazonaws.com/noam-gaash.co.il/$PULL_REQUEST/open-bus/$UNIQUE_ID/storybook/index.html
+            Test Report (if available): 'https://s3.amazonaws.com/noam-gaash.co.il/$PULL_REQUEST/open-bus/$UNIQUE_ID/test-results/index.html'
 
       - name: create comment
         uses: peter-evans/create-or-update-comment@v1
         if: steps.fc.outputs.comment-id == ''
         with:
           issue-number: ${{ env.PR_NUMBER }}
           body: |
-            Preview: https://s3.amazonaws.com/noam-gaash.co.il/${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.run_number }}/index.html
-            Preview Storybook: https://s3.amazonaws.com/noam-gaash.co.il/${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.run_number }}/storybook/index.html
-            Test Report (if available): 'https://s3.amazonaws.com/noam-gaash.co.il/${{ github.event.workflow_run.id }}/open-bus/${{ github.event.workflow_run.head_sha }}/test-results/index.html'
+            Preview: https://s3.amazonaws.com/noam-gaash.co.il/$PULL_REQUEST/open-bus/$UNIQUE_ID/index.html
+            Preview Storybook: https://s3.amazonaws.com/noam-gaash.co.il/$PULL_REQUEST/open-bus/$UNIQUE_ID/storybook/index.html
+            Test Report (if available): 'https://s3.amazonaws.com/noam-gaash.co.il/$PULL_REQUEST/open-bus/$UNIQUE_ID/test-results/index.html'
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -154,7 +154,7 @@ jobs:
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
           aws_bucket: noam-gaash.co.il
           source_dir: test-results
-          destination_dir: ${{ github.run_id }}/open-bus/${{ github.sha }}/test-results
+          destination_dir: ${{ github.event.pull_request.number }}/open-bus/${{ github.event.pull_request.number }}-sha-${{ github.sha }}/test-results
       - name: Set test results
         uses: myrotvorets/set-commit-status-action@master
         if: always() && ${{ env.AWS_KEY_ID }}
@@ -164,7 +164,7 @@ jobs:
           description: 'Playwright html report with traces'
           status: ${{needs.test.result}}
           context: 'Test results'
-          targetUrl: 'https://s3.amazonaws.com/noam-gaash.co.il/${{ github.run_id }}/open-bus/${{ github.sha }}/test-results/index.html'
+          targetUrl: 'https://s3.amazonaws.com/noam-gaash.co.il/${{ github.event.pull_request.number }}/open-bus/${{ github.event.pull_request.number }}-sha-${{ github.sha }}/test-results/index.html'
   build-outside-docker:
     runs-on: ubuntu-latest
     steps:
@@ -185,3 +185,22 @@ jobs:
     steps:
       - name: All passed
         run: echo "All passed"
+      - name: Generate PULL_REQUEST and UNIQUE_ID Variables
+        run: |
+          # Generate variables dynamically based on pull request context or commit SHA.
+          PULL_REQUEST=${{ github.event.pull_request.number || 'undefined' }}
+          UNIQUE_ID="pr-${{ github.event.pull_request.number || 'undefined' }}-sha-${{ github.sha }}"
+
+          # Debug: Print the variables to verify they are set correctly
+          echo "PULL_REQUEST=$PULL_REQUEST"
+          echo "UNIQUE_ID=$UNIQUE_ID"
+
+          # Save variables to a file to be used as an artifact.
+          echo "PULL_REQUEST=$PULL_REQUEST" > vars.env
+          echo "UNIQUE_ID=$UNIQUE_ID" >> vars.env
+
+      - name: Upload Variables as Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: pr-vars # Artifact containing the variables.
+          path: vars.env