Update workflow file

material-extensions · Nov 12, 2023 · eb96497 · eb96497
1 parent d3625d2
commit eb96497
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/icon-review.yml b/.github/workflows/icon-review.yml
@@ -26,22 +26,23 @@ jobs:
       - name: Upload PNG to Repository ⬆️
         run: |
           mkdir -p review-images
-          mv ./preview.png review-images/${{ github.event.pull_request.number }}.png
+          mv ./preview.png review-images/${{ github.event.pull_request.number }}_${{ github.sha }}.png
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
           git checkout -b review-images
           git add review-images/
           git commit -m "Add generated review image"
           git config pull.rebase true
-          git push origin review-images --force
+          git pull origin review-images -X ours
+          git push origin review-images
 
       - name: Post previews in PR
         uses: actions/github-script@v6
         with:
           script: |
             const fs = require('fs');
             const pngFilePath = './preview.png';
-            const commentBody = '![Generated PNG](https://raw.githubusercontent.com/' + context.repo.owner + '/' + context.repo.repo + '/' + 'review-images/review-images/${{ github.event.pull_request.number }}.png)';
+            const commentBody = '![Generated PNG](https://raw.githubusercontent.com/' + context.repo.owner + '/' + context.repo.repo + '/' + 'review-images/review-images/${{ github.event.pull_request.number }}_${{ github.sha }}.png)';
 
             github.rest.issues.createComment({
               issue_number: context.issue.number,