Skip to content

Commit

Permalink
fix combine workflow failed
Browse files Browse the repository at this point in the history
  • Loading branch information
Manh Cao authored and Manh Cao committed Oct 8, 2024
1 parent 9fe67c8 commit 5f67f40
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
**PR Checklist**

- [] My protocol folder name must be **kebab-case**.
- [] I have set all necessary fields like the example in [README file](../README.md).
- [] My protocol's icon is a **png** image and smaller than **20KB**.
- [] I have set asset addresses correctly according to their types (PT token address for PT integrations, LP token address for LP integration, etc).
- [] I have set the integration URL valid and it points to the appropriate page.
- [] I did not change the global config.json file. This file will be automatically generated.
- [ ] My protocol folder name must be **kebab-case**.
- [ ] I have set all necessary fields like the example in [README file](../README.md).
- [ ] My protocol's icon is a **png** image and smaller than **20KB**.
- [ ] I have set asset addresses correctly according to their types (PT token address for PT integrations, LP token address for LP integration, etc).
- [ ] I have set the integration URL valid and it points to the appropriate page.
- [ ] I did not change the global config.json file. This file will be automatically generated.
8 changes: 6 additions & 2 deletions .github/workflows/combine-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 'main'
- 'manh/fix-combine-workflow'

jobs:
merge_json_files:
Expand Down Expand Up @@ -31,8 +32,11 @@ jobs:
git config --global user.name "$GIT_USERNAME"
git config --global user.email "$GIT_EMAIL"
git add config.json
git diff-index --quiet HEAD || git commit -m "Merge JSON files"
git push
echo 'start'
git diff-index --quiet HEAD || (git commit -m "Merge JSON files" && git push)
echo $?
echo 'finished'
exit 0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GIT_USERNAME: github-actions[bot]
Expand Down

0 comments on commit 5f67f40

Please sign in to comment.