Skip to content

Commit

Permalink
Merge branch 'develop-postgres' of https://github.com/PalisadoesFound…
Browse files Browse the repository at this point in the history
…ation/talawa-admin into orgcard_cov_inc
  • Loading branch information
MayankJha014 committed Jan 20, 2025
2 parents 0dd35cc + 5b4983b commit b3b2da5
Show file tree
Hide file tree
Showing 2,502 changed files with 114,875 additions and 47,632 deletions.
1 change: 1 addition & 0 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ reviews:
drafts: false
base_branches:
- develop
- develop-postgres
- main
chat:
auto_reply: true
7 changes: 7 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ src/components/CheckIn/tagTemplate.ts
package.json
package-lock.json
tsconfig.json
fix-readme-links.js
fix-repo-url.js
# Ignore the Docusaurus website subdirectory
docs/**

#Ignore markdown files from linting
*.md
13 changes: 12 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,16 @@
"version": "detect"
}
},
"ignorePatterns": ["**/*.css", "**/*.scss", "**/*.less", "**/*.json"]
"ignorePatterns": [
"**/*.css",
"**/*.scss",
"**/*.less",
"**/*.json",
"**/*.svg",
"docs/docusaurus.config.ts",
"docs/sidebars.ts",
"docs/src/**",
"docs/blog/**",
"pyproject.toml"
]
}
3 changes: 3 additions & 0 deletions .flake8
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
122 changes: 0 additions & 122 deletions .github/workflows/eslint_disable_check.py

This file was deleted.

65 changes: 65 additions & 0 deletions .github/workflows/merge-conflict-check.yml
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
Loading

0 comments on commit b3b2da5

Please sign in to comment.