Skip to content

Commit

Permalink
fix: fetch new refs before merge
Browse files Browse the repository at this point in the history
  • Loading branch information
king04aman authored Oct 18, 2024
1 parent a636aeb commit b2b733e
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion .github/workflows/generate-project-list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ jobs:
token: ${{ secrets.ACTION_TOKEN }}
persist-credentials: true

- name: Fetch latest changes
run: git fetch origin

- name: Merge changes
run: |
git merge origin/main || echo "No new changes to merge or merge conflict"
- name: Generate project list
run: |
exclude_dirs=(.github)
Expand Down Expand Up @@ -52,7 +59,7 @@ jobs:
- name: Commit project list
run: |
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "project-maintainer[bot]"
git config --global user.name "github-actions[bot]"
git add PROJECTS.md
git commit -m "Update project list"
git push --force-with-lease
Expand Down

0 comments on commit b2b733e

Please sign in to comment.