From 5f67f40ac5dc76835b2b5f6799c4824d4d9a22f3 Mon Sep 17 00:00:00 2001 From: Manh Cao Date: Tue, 8 Oct 2024 13:46:58 +0700 Subject: [PATCH] fix combine workflow failed --- .github/pull_request_template.md | 12 ++++++------ .github/workflows/combine-config.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a3beb1a..52d1311 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -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. \ No newline at end of file +- [ ] 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. \ No newline at end of file diff --git a/.github/workflows/combine-config.yml b/.github/workflows/combine-config.yml index 93327b0..3d26c3e 100644 --- a/.github/workflows/combine-config.yml +++ b/.github/workflows/combine-config.yml @@ -4,6 +4,7 @@ on: push: branches: - 'main' + - 'manh/fix-combine-workflow' jobs: merge_json_files: @@ -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]