Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

Commit

Permalink
update workflow sync with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
isabelle-pundix committed Jul 28, 2024
1 parent 09a9567 commit d1830a3
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/sync-with-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,24 @@ jobs:
- name: Fetch Upstream Changes
run: git fetch upstream

- name: Check for Differences
id: diff
- name: Check for Differences in Tokens Directory and FXList.json
id: check_diff
run: |
git fetch upstream main
git diff --exit-code upstream/main
continue-on-error: true
git diff --exit-code upstream/main -- Tokens FXList.json || echo "changes"
if [ $? -eq 0 ]; then
echo "::set-output name=changes::false"
else
echo "::set-output name=changes::true"
fi
- name: Merge Upstream Changes
if: steps.diff.outcome != 'success'
if: steps.check_diff.outputs.changes == 'true'
run: |
git merge upstream/main
- name: Push Changes
if: steps.diff.outcome != 'success'
if: steps.check_diff.outputs.changes == 'true'
run: git push origin main
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}

0 comments on commit d1830a3

Please sign in to comment.