Skip to content

Commit b2b733e

Browse files
authored
fix: fetch new refs before merge
1 parent a636aeb commit b2b733e

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

.github/workflows/generate-project-list.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ jobs:
1717
token: ${{ secrets.ACTION_TOKEN }}
1818
persist-credentials: true
1919

20+
- name: Fetch latest changes
21+
run: git fetch origin
22+
23+
- name: Merge changes
24+
run: |
25+
git merge origin/main || echo "No new changes to merge or merge conflict"
26+
2027
- name: Generate project list
2128
run: |
2229
exclude_dirs=(.github)
@@ -52,7 +59,7 @@ jobs:
5259
- name: Commit project list
5360
run: |
5461
git config --global user.email "github-actions[bot]@users.noreply.github.com"
55-
git config --global user.name "project-maintainer[bot]"
62+
git config --global user.name "github-actions[bot]"
5663
git add PROJECTS.md
5764
git commit -m "Update project list"
5865
git push --force-with-lease

0 commit comments

Comments
 (0)