-
-
Notifications
You must be signed in to change notification settings - Fork 848
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop-postgres' of https://github.com/PalisadoesFound…
…ation/talawa-admin into orgcard_cov_inc
- Loading branch information
Showing
2,502 changed files
with
114,875 additions
and
47,632 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ reviews: | |
drafts: false | ||
base_branches: | ||
- develop | ||
- develop-postgres | ||
- main | ||
chat: | ||
auto_reply: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[flake8] | ||
ignore = E402,E722,E203,F401,W503 | ||
max-line-length = 80 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
name: Merge Conflict Check Workflow | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- '**' | ||
types: | ||
- opened | ||
- reopened | ||
- synchronize | ||
- ready_for_review | ||
|
||
jobs: | ||
Merge-Conflict-Check: | ||
name: Check for Merge Conflicts | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout Code | ||
uses: actions/checkout@v4 | ||
|
||
- name: Check Mergeable Status via Github API | ||
env: | ||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
run: | | ||
PR_NUMBER=${{ github.event.pull_request.number }} | ||
max_retries=3 | ||
retry_delay=5 | ||
for ((i=1; i<=max_retries; i++)); do | ||
echo "Attempt $i of $max_retries" | ||
if ! response=$(gh api "repos/${{ github.repository }}/pulls/$PR_NUMBER" --jq '.mergeable'); then | ||
if [[ $response == *"rate limit exceeded"* ]]; then | ||
echo "Rate limit exceeded. Waiting before retry..." | ||
sleep 60 # Wait longer for rate limit | ||
else | ||
echo "Failed to call GitHub API: $response" | ||
if [ $i -eq $max_retries ]; then | ||
echo "Maximum retries reached. Exiting." | ||
exit 1 | ||
fi | ||
sleep $retry_delay | ||
fi | ||
continue | ||
fi | ||
case "$response" in | ||
"true") | ||
echo "No conflicts detected." | ||
exit 0 | ||
;; | ||
"false") | ||
echo "Merge conflicts detected." | ||
exit 1 | ||
;; | ||
*) | ||
echo "Mergeable status unknown: $response" | ||
if [ $i -eq $max_retries ]; then | ||
echo "Maximum retries reached. Exiting." | ||
exit 1 | ||
fi | ||
sleep $retry_delay | ||
;; | ||
esac | ||
done |
Oops, something went wrong.