-
-
Notifications
You must be signed in to change notification settings - Fork 750
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enhance setup.js for Improved Docker Compatibility #2447
Closed
VanshikaSabharwal
wants to merge
91
commits into
PalisadoesFoundation:develop-postgres
from
VanshikaSabharwal:setup
Closed
Changes from 78 commits
Commits
Show all changes
91 commits
Select commit
Hold shift + click to select a range
5821d59
added docker check to workflow
VanshikaSabharwal 1519682
Merge branch 'develop' into docker-1
VanshikaSabharwal 81bbb3e
made recommended changes to docker check in workflow
VanshikaSabharwal 7d04c94
made recommended changes to docker check in workflow
VanshikaSabharwal f8389f6
added changes to docker check inn workflow as recommended
VanshikaSabharwal f54dcf2
added changes
VanshikaSabharwal b93aed6
updated indentation in pull-request.yml file
VanshikaSabharwal a0ee511
updated indentation in pull-request.yml file
VanshikaSabharwal 235d163
added Dockerfile and Docker-compose.yml file
VanshikaSabharwal 66f4843
added Dockerfile and Docker-compose.yml file
VanshikaSabharwal aef2485
Merge branch 'develop' into dockerfile-1
VanshikaSabharwal 0fa9fe5
updated .docker-ignore file
VanshikaSabharwal 88626b7
Merge branch 'dockerfile-1' of https://github.com/VanshikaSabharwal/t…
VanshikaSabharwal 6fd1e01
Merge branch 'develop' into docker-1
VanshikaSabharwal e572cf4
Merge branch 'docker-1' of https://github.com/VanshikaSabharwal/talaw…
VanshikaSabharwal cfdeff5
added recommended changes by code rabbit
VanshikaSabharwal e188853
added recommended changes by code rabbit
VanshikaSabharwal 9a2b428
added recommended changes by code rabbit
VanshikaSabharwal 12e5474
added recommended changes by code rabbit
VanshikaSabharwal 17a12f7
added recommended changes by code rabbit
VanshikaSabharwal a44ecdb
added recommended changes by code rabbit
VanshikaSabharwal 526a2cf
properly formatted code
VanshikaSabharwal 82836f0
chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433)
dependabot[bot] a97314c
chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434)
dependabot[bot] 32eb6a9
chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435)
dependabot[bot] ab509f6
chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436)
dependabot[bot] fb913e1
Update pull-request.yml
palisadoes d4fca6f
trying to make docker check pass
VanshikaSabharwal 41bb9cf
Merge branch 'develop' into docker-1
VanshikaSabharwal 7966dda
trying to make docker check pass
VanshikaSabharwal ec8ec5f
Merge branch 'docker-1' of https://github.com/VanshikaSabharwal/talaw…
VanshikaSabharwal 96d5e9a
updated INSTALLATION.md
VanshikaSabharwal ef08944
updated INSTALLATION.md
VanshikaSabharwal 8236c9a
added recommended changes to INSTALLATION.md
VanshikaSabharwal b09c696
added recommended changes to INSTALLATION.md
VanshikaSabharwal c8c42a4
added recommended changes to INSTALLATION.md
VanshikaSabharwal d16b95e
Update dependabot.yaml
palisadoes aa1cb05
updated docker workflow
VanshikaSabharwal 5e38619
Merge branch 'develop' into docker-1
VanshikaSabharwal 435c0bd
Merge branch 'docker-1' of https://github.com/VanshikaSabharwal/talaw…
VanshikaSabharwal 97bb5e6
updated INSTALLATION.md
VanshikaSabharwal 0b47923
updated INSTALLATION.md
VanshikaSabharwal 31b4bc5
updated INSTALLATION.md
VanshikaSabharwal c0884d1
updated setup.ts
VanshikaSabharwal 9412b27
Merge branch 'develop-postgres' into setup
VanshikaSabharwal eac28f7
did recommended changes to setup.ts
VanshikaSabharwal f1cd66a
Merge branch 'setup' of https://github.com/VanshikaSabharwal/talawa-a…
VanshikaSabharwal 15282bc
updated setup.ts
VanshikaSabharwal 5830ec7
updated INSTALLATION.md
VanshikaSabharwal 0ebafd5
Merge branch 'develop-postgres' into setup
VanshikaSabharwal c426e45
Merge branch 'develop-postgres' into setup
VanshikaSabharwal 97dde86
Merge branch 'develop-postgres' into setup
VanshikaSabharwal f9d03de
pull-request.yml formatted
VanshikaSabharwal 6243659
solved the problem with linting of dockerfile in pull-request.yml file
VanshikaSabharwal 4c539cb
solved the problem with linting of dockerfile in pull-request.yml file
VanshikaSabharwal 39115fb
solved the problem with linting of dockerfile in pull-request.yml file
VanshikaSabharwal 3192d45
made recommended changes to pull-request.yml
VanshikaSabharwal 5cd5a48
testing eslint fix
VanshikaSabharwal da0113c
testing eslint
VanshikaSabharwal de5cb43
testing eslint
VanshikaSabharwal 2b4f3a0
added askForDocker file with test file
VanshikaSabharwal 3174ea4
Merge branch 'develop-postgres' into setup
VanshikaSabharwal 7eb38f7
Merge branch 'develop-postgres' into setup
VanshikaSabharwal af8cd4a
updated setup.ts file
VanshikaSabharwal 594765d
updated askForDocker
VanshikaSabharwal cd99eb0
Merge branch 'develop-postgres' into setup
VanshikaSabharwal 5c41622
updated linting error
VanshikaSabharwal f9b02a1
Merge branch 'develop-postgres' into setup
VanshikaSabharwal 05dcfc8
adding
VanshikaSabharwal bab3153
added vitest
VanshikaSabharwal 99bd739
testing
VanshikaSabharwal c298068
testing type error issue
VanshikaSabharwal a8ee09e
updated eslint_disable_check.py
VanshikaSabharwal 425b45f
updated eslint_disable_check.py
VanshikaSabharwal dd635c4
updated eslint_disable_check.py
VanshikaSabharwal f27ed9e
updated pull-request.yml
VanshikaSabharwal 9316808
updated pull-request.yml
VanshikaSabharwal ae3dac5
updated pull-request.yml
VanshikaSabharwal 1f9cacc
updated pull-request.yml
VanshikaSabharwal e863c6b
updated .eslintrc.json
VanshikaSabharwal a859d25
updated .eslintrc.json
VanshikaSabharwal 418092e
updated .eslintrc.json
VanshikaSabharwal 65e2b3a
updated .eslintrc.json
VanshikaSabharwal 55a8e7c
updated .eslintrc.json
VanshikaSabharwal 3591428
updated .eslintrc.json
VanshikaSabharwal c860961
updated .eslintrc.json
VanshikaSabharwal 5be01a6
added linters for dockerfile and markdown file
VanshikaSabharwal ff4ea49
Revert "updated .eslintrc.json"
VanshikaSabharwal da04be8
testing
VanshikaSabharwal 557c203
testing changes
VanshikaSabharwal 780ae27
testing changes
VanshikaSabharwal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
@@ -1,5 +1,17 @@ | ||
# Contains the PDF file of the Tag as JSON string, thus does not need to be linted | ||
|
||
src/components/CheckIn/tagTemplate.ts | ||
package.json | ||
package-lock.json | ||
tsconfig.json | ||
|
||
\*.swp | ||
.vscode/ | ||
|
||
Dockerfile | ||
.dockerignore | ||
.git/ | ||
|
||
**/\*.yml | ||
**/_.dockerfile | ||
\*\*/_.py \*_/_.md |
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 |
---|---|---|
|
@@ -46,7 +46,7 @@ jobs: | |
- name: Check formatting | ||
if: steps.changed-files.outputs.only_changed != 'true' | ||
run: npm run format:check | ||
|
||
- name: Run formatting if check fails | ||
if: failure() | ||
run: npm run format | ||
|
@@ -57,10 +57,25 @@ jobs: | |
|
||
- name: Check for linting errors in modified files | ||
if: steps.changed-files.outputs.only_changed != 'true' | ||
env: | ||
env: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }} | ||
run: npx eslint ${CHANGED_FILES} && python .github/workflows/eslint_disable_check.py | ||
|
||
run: | | ||
# Filter files to include only .ts and .tsx files | ||
TS_FILES=$(echo "$CHANGED_FILES" | grep -E '\.(ts|tsx)$') | ||
|
||
# Check if there are any TypeScript files to lint | ||
if [ -n "$TS_FILES" ]; then | ||
# Run linting on the changed TypeScript files | ||
npx eslint $TS_FILES --ignore-pattern '**/*.yml' --ignore-pattern '**/*.dockerfile' --ignore-pattern '**/*.py' --ignore-pattern '**/*.md' --no-ignore | ||
|
||
|
||
|
||
# Run the Python script for eslint-disable check on the TypeScript files | ||
python .github/workflows/eslint_disable_check.py | ||
else | ||
echo "No .ts or .tsx files to lint." | ||
fi | ||
|
||
- name: Check for TSDoc comments | ||
run: npm run check-tsdoc # Run the TSDoc check script | ||
|
||
|
@@ -89,7 +104,7 @@ jobs: | |
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v4 | ||
|
||
- name: Get Changed Unauthorized files | ||
id: changed-unauth-files | ||
uses: tj-actions/changed-files@v45 | ||
|
@@ -130,10 +145,10 @@ jobs: | |
*.password | ||
*.secret | ||
*.credentials | ||
|
||
- name: List all changed unauthorized files | ||
if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true' | ||
env: | ||
env: | ||
VanshikaSabharwal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
CHANGED_UNAUTH_FILES: ${{ steps.changed-unauth-files.outputs.all_changed_files }} | ||
run: | | ||
for file in ${CHANGED_UNAUTH_FILES}; do | ||
|
@@ -154,14 +169,14 @@ jobs: | |
uses: tj-actions/changed-files@v45 | ||
|
||
- name: Echo number of changed files | ||
env: | ||
env: | ||
CHANGED_FILES_COUNT: ${{ steps.changed-files.outputs.all_changed_files_count }} | ||
run: | | ||
echo "Number of files changed: $CHANGED_FILES_COUNT" | ||
|
||
- name: Check if the number of changed files is less than 100 | ||
if: steps.changed-files.outputs.all_changed_files_count > 100 | ||
env: | ||
env: | ||
CHANGED_FILES_COUNT: ${{ steps.changed-files.outputs.all_changed_files_count }} | ||
run: | | ||
echo "Error: Too many files (greater than 100) changed in the pull request." | ||
|
@@ -201,11 +216,11 @@ jobs: | |
|
||
- name: Install Dependencies | ||
run: npm install | ||
|
||
- name: Get changed TypeScript files | ||
id: changed-files | ||
uses: tj-actions/changed-files@v45 | ||
|
||
- name: Run Jest Tests | ||
if: steps.changed-files.outputs.only_changed != 'true' | ||
env: | ||
|
@@ -227,8 +242,8 @@ jobs: | |
if ! npx lcov-result-merger 'coverage/*/lcov.info' > 'coverage/lcov.info'; then | ||
echo "Failed to merge coverage reports" | ||
exit 1 | ||
fi | ||
fi | ||
|
||
- name: TypeScript compilation for changed files | ||
run: | | ||
for file in ${{ steps.changed-files.outputs.all_files }}; do | ||
|
@@ -249,7 +264,7 @@ jobs: | |
- name: Test acceptable level of code coverage | ||
uses: VeryGoodOpenSource/very_good_coverage@v3 | ||
with: | ||
path: "./coverage/lcov.info" | ||
path: './coverage/lcov.info' | ||
min_coverage: 0.0 | ||
|
||
Graphql-Inspector: | ||
|
@@ -267,18 +282,19 @@ jobs: | |
|
||
- name: resolve dependency | ||
run: npm install -g @graphql-inspector/cli | ||
|
||
VanshikaSabharwal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- name: Clone API Repository | ||
run: | | ||
# Retrieve the complete branch name directly from the GitHub context | ||
FULL_BRANCH_NAME=${{ github.base_ref }} | ||
echo "FULL_Branch_NAME: $FULL_BRANCH_NAME" | ||
|
||
# Clone the specified repository using the extracted branch name | ||
git clone --branch $FULL_BRANCH_NAME https://github.com/PalisadoesFoundation/talawa-api && ls -a | ||
git clone --branch $FULL_BRANCH_NAME https://github.com/PalisadoesFoundation/talawa-api && ls -a | ||
|
||
- name: Validate Documents | ||
run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql' | ||
|
||
VanshikaSabharwal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Start-App-Without-Docker: | ||
name: Check if Talawa Admin app starts (No Docker) | ||
runs-on: ubuntu-latest | ||
|
@@ -350,6 +366,7 @@ jobs: | |
if [ -f .pidfile_dev ]; then | ||
kill "$(cat .pidfile_dev)" | ||
fi | ||
|
||
Docker-Start-Check: | ||
name: Check if Talawa Admin app starts in Docker | ||
runs-on: ubuntu-latest | ||
|
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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.