Skip to content

Commit 6c9915d

Browse files
fix(ci): use cp+fetch+reset pattern to avoid push conflicts between concurrent crawlers
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
1 parent 9b2b49c commit 6c9915d

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/crawl.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,14 @@ jobs:
4848
run: |
4949
git config user.name "Altor Crawler Bot"
5050
git config user.email "bot@altorlab.com"
51+
cp react-app/public/data/ai-companies.json /tmp/ai-companies.json
52+
git fetch origin master
53+
git reset --hard origin/master
54+
cp /tmp/ai-companies.json react-app/public/data/ai-companies.json
5155
git add react-app/public/data/ai-companies.json
5256
if git diff --staged --quiet; then
5357
echo "No changes detected — skipping commit"
5458
else
55-
git pull --rebase origin master
5659
git commit -m "chore(data): daily AI stack crawl $(date -u '+%Y-%m-%d')"
5760
git push
5861
fi

.github/workflows/fetch-automations.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,14 @@ jobs:
4444
run: |
4545
git config user.name "Altor Crawler Bot"
4646
git config user.email "bot@altorlab.com"
47+
cp react-app/public/data/automations.json /tmp/automations.json
48+
git fetch origin master
49+
git reset --hard origin/master
50+
cp /tmp/automations.json react-app/public/data/automations.json
4751
git add react-app/public/data/automations.json
4852
if git diff --staged --quiet; then
4953
echo "No changes — skipping commit"
5054
else
51-
git pull --rebase origin master
5255
git commit -m "chore(data): daily automation workflows update $(date -u '+%Y-%m-%d')"
5356
git push
5457
fi

.github/workflows/fetch-mcp.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ jobs:
4646
run: |
4747
git config user.name "Altor Crawler Bot"
4848
git config user.email "bot@altorlab.com"
49+
cp react-app/public/data/mcp-servers.json /tmp/mcp-servers.json
50+
git fetch origin master
51+
git reset --hard origin/master
52+
cp /tmp/mcp-servers.json react-app/public/data/mcp-servers.json
4953
git add react-app/public/data/mcp-servers.json
5054
if git diff --staged --quiet; then
5155
echo "No changes — skipping commit"
5256
else
53-
git pull --rebase origin master
5457
git commit -m "chore(data): daily MCP server directory update $(date -u '+%Y-%m-%d')"
5558
git push
5659
fi

0 commit comments

Comments
 (0)