Skip to content

Commit

Permalink
Revert change which removed pngs
Browse files Browse the repository at this point in the history
  • Loading branch information
jordandsullivan authored Jan 3, 2025
1 parent 51c7bb8 commit 4338828
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/ucc-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,13 @@ jobs:
run: |
git config --global user.email "actions@github.com"
git config --global user.name "GitHub Actions"
# Ensure the latest changes from the remote branch are fetched
- name: Fetch latest changes and auto-resolve conflicts for .png files
run: |
git fetch origin ${{ github.head_ref || github.ref_name }}
git switch ${{ github.head_ref || github.ref_name }}
# Merge changes and resolve conflicts favoring the generated .png files
git merge origin/${{ github.head_ref || github.ref_name }} || true
git checkout --theirs -- benchmarks/*.png
git add benchmarks/*.png
# Commit and push results
- name: Commit and push results
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git switch ${{ github.head_ref || github.ref_name }}
git add benchmarks/*
git status
git commit -m "Update benchmark results" || echo "No changes to commit"
git push origin HEAD:${{ github.head_ref || github.ref_name }}

0 comments on commit 4338828

Please sign in to comment.