From e5b4828827f89c217a9dbbe1d89a20c3623b6c17 Mon Sep 17 00:00:00 2001 From: manh-pendle <155348284+manh-pendle@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:04:40 +0700 Subject: [PATCH] fix combine workflow failed (#62) Co-authored-by: Manh Cao --- .github/pull_request_template.md | 12 ++++++------ .github/workflows/combine-config.yml | 4 ++-- 2 files changed, 8 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..e5f52b3 100644 --- a/.github/workflows/combine-config.yml +++ b/.github/workflows/combine-config.yml @@ -31,8 +31,8 @@ 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 + git update-index --refresh + git diff-index --quiet HEAD || (git commit -m "Merge JSON files" && git push) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GIT_USERNAME: github-actions[bot]