-
-
Notifications
You must be signed in to change notification settings - Fork 803
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 20250110082558 Deleted all files in the main branch in anticipation of merging develop into main cleanly * 20250110082559 Merge develop into main
- Loading branch information
1 parent
3d1f1f0
commit ba4d344
Showing
536 changed files
with
55,244 additions
and
27,108 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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| node_modules | ||
| npm-debug.log | ||
| Dockerfile | ||
| .git | ||
| .gitignore | ||
| .env | ||
| .env.* | ||
| dist | ||
| coverage | ||
| .nyc_output | ||
| *.md | ||
| .github | ||
| tests | ||
| __tests__ | ||
| *.test.* | ||
| *.spec.* | ||
| # Development files | ||
| *.log | ||
| *.lock | ||
| .DS_Store | ||
| .idea | ||
| .vscode | ||
| # Build artifacts | ||
| build | ||
| out |
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 |
|---|---|---|
| @@ -1,2 +1,8 @@ | ||
| # Contains the PDF file of the Tag as JSON string, thus does not need to be linted | ||
| src/components/CheckIn/tagTemplate.ts | ||
| src/components/CheckIn/tagTemplate.ts | ||
| package.json | ||
| package-lock.json | ||
| tsconfig.json | ||
|
|
||
| # Ignore the Docusaurus website subdirectory | ||
| docs/** |
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
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 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
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.