Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit e50baf9
Merge: 3fd0675 65989b1
Author: ANKIT VARSHNEY <132201033+AVtheking@users.noreply.github.com>
Date:   Tue Feb 13 23:34:06 2024 +0530

    Merge branch 'PalisadoesFoundation:develop' into develop

commit 65989b1
Author: Paras Awasthi <121304240+i-m-Paras@users.noreply.github.com>
Date:   Tue Feb 13 18:21:56 2024 +0530

    removeAdvertisement.ts test updated to 100% coverage (PalisadoesFoundation#1835)

    * removeAdvertisement.ts test updated to 100% coverage

    * failing tests updated

    * Update package.json

    * Update package.json

    * Update package-lock.json

    * Update package.json

    * Update package.json

    * Update package.json

    * Update package.json

    * Update package-lock.json back to normal

    * Update package-lock.json

    * Update package-lock.json

    * Update package-lock.json

    * Update package-lock.json

commit cc21e65
Author: Anvita Mahajan <78889572+Anvita0305@users.noreply.github.com>
Date:   Tue Feb 13 18:21:20 2024 +0530

    Added tests for file src/resolvers/Mutation/createPost.ts (PalisadoesFoundation#1833)

    * Modified tests

    * some minor changes

    * Fixed Errors

    * 100% code covered

    * Fixed Linting errors

commit f95b71f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Feb 12 10:12:01 2024 -0800

    chore(deps): bump @types/validator from 13.11.8 to 13.11.9 (PalisadoesFoundation#1845)

    Bumps [@types/validator](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/validator) from 13.11.8 to 13.11.9.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/validator)

    ---
    updated-dependencies:
    - dependency-name: "@types/validator"
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit a6a5758
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Feb 12 09:51:43 2024 -0800

    chore(deps): bump @graphql-codegen/typescript from 4.0.1 to 4.0.4 (PalisadoesFoundation#1846)

    Bumps [@graphql-codegen/typescript](https://github.com/dotansimha/graphql-code-generator/tree/HEAD/packages/plugins/typescript/typescript) from 4.0.1 to 4.0.4.
    - [Release notes](https://github.com/dotansimha/graphql-code-generator/releases)
    - [Changelog](https://github.com/dotansimha/graphql-code-generator/blob/master/packages/plugins/typescript/typescript/CHANGELOG.md)
    - [Commits](https://github.com/dotansimha/graphql-code-generator/commits/@graphql-codegen/typescript@4.0.4/packages/plugins/typescript/typescript)

    ---
    updated-dependencies:
    - dependency-name: "@graphql-codegen/typescript"
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit b738582
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Feb 12 09:49:35 2024 -0800

    chore(deps): bump lint-staged from 15.2.1 to 15.2.2 (PalisadoesFoundation#1844)

    Bumps [lint-staged](https://github.com/okonet/lint-staged) from 15.2.1 to 15.2.2.
    - [Release notes](https://github.com/okonet/lint-staged/releases)
    - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md)
    - [Commits](lint-staged/lint-staged@v15.2.1...v15.2.2)

    ---
    updated-dependencies:
    - dependency-name: lint-staged
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 56cb29f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Feb 12 09:49:16 2024 -0800

    chore(deps): bump nodemailer from 6.9.8 to 6.9.9 (PalisadoesFoundation#1843)

    Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.9.8 to 6.9.9.
    - [Release notes](https://github.com/nodemailer/nodemailer/releases)
    - [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
    - [Commits](nodemailer/nodemailer@v6.9.8...v6.9.9)

    ---
    updated-dependencies:
    - dependency-name: nodemailer
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit b445770
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Feb 12 09:48:58 2024 -0800

    chore(deps): bump @typescript-eslint/eslint-plugin from 6.20.0 to 6.21.0 (PalisadoesFoundation#1842)

    Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.20.0 to 6.21.0.
    - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
    - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
    - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.21.0/packages/eslint-plugin)

    ---
    updated-dependencies:
    - dependency-name: "@typescript-eslint/eslint-plugin"
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 125853a
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 23:20:44 2024 +0530

    Update pull_changes.yml

commit d069d40
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 22:57:38 2024 +0530

    Update Advertisement.ts

commit 5fe0ae8
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 22:44:37 2024 +0530

    Update pull_changes.yml

commit 26e0d10
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 22:40:11 2024 +0530

    Update push.yml

commit 60d4b4b
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 22:18:30 2024 +0530

    Update push.yml

commit 07f7042
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 22:01:00 2024 +0530

    Update Advertisement.ts

commit 12ccdb6
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 21:29:14 2024 +0530

    Update Advertisement.ts

commit 4e6113d
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 21:26:51 2024 +0530

    Update push.yml

commit 73b68f0
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 20:57:18 2024 +0530

    Update Advertisement.ts

commit 70701ba
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 20:54:11 2024 +0530

    Update push.yml

commit 57f4d91
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 20:30:17 2024 +0530

    Update Advertisement.ts

commit e1bbff6
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 20:25:45 2024 +0530

    Update pull_changes.yml

commit 332c429
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 20:06:36 2024 +0530

    Update pull_changes.yml

commit d7450c4
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 20:06:01 2024 +0530

    Update push.yml

commit 7b9a88f
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 19:50:17 2024 +0530

    Update push.yml

commit 94d2d18
Author: TASNEEM KOUSHAR <imatasneemkoushar@gmail.com>
Date:   Sun Feb 11 19:39:08 2024 +0530

    Create pull_changes.yml

commit 031adf9
Author: Peter Harrison <16875803+palisadoes@users.noreply.github.com>
Date:   Sat Feb 10 19:27:48 2024 -0800

    Restore the automated-docs if statement

commit 3fd0675
Merge: ad9a412 fa10711
Author: ANKIT VARSHNEY <132201033+AVtheking@users.noreply.github.com>
Date:   Fri Feb 9 00:59:59 2024 +0530

    Merge branch 'PalisadoesFoundation:develop' into develop
  • Loading branch information
AVtheking committed Feb 13, 2024
1 parent bb3d38b commit 4c39066
Show file tree
Hide file tree
Showing 8 changed files with 731 additions and 193 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/pull_changes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Copy Docs to Talawa Docs

on:
schedule:
- cron: '*/5 * * * *'
jobs:
copy-docs-to-talawa-docs:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/automated-docs'
# needs: Generate-Documentation
steps:
- uses: actions/checkout@v3
- uses: dmnemec/copy_file_to_another_repo_action@v1.1.1
env:
API_TOKEN_GITHUB: ${{secrets.TALAWA_DOCS_SYNC}}
with:
source_file: 'talawa-api-docs/'
destination_repo: 'PalisadoesFoundation/talawa-docs'
destination_branch: 'develop'
destination_folder: 'docs/'
user_email: '${{env.email}}'
user_name: '${{github.actor}}'
commit_message: 'Talawa API docs updated'
37 changes: 19 additions & 18 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
Generate-Documentation:
name: Generate Documentation
runs-on: ubuntu-latest
# if: github.ref == 'refs/heads/automated-docs'
if: github.ref == 'refs/heads/develop'
needs: Push-Workflow
steps:
- name: Checkout repository
Expand Down Expand Up @@ -150,23 +150,24 @@ jobs:
name: documentation-api
path: talawa-api-docs

Copy-docs-to-talawa-docs:
runs-on: ubuntu-latest
needs: Generate-Documentation
steps:
- uses: actions/checkout@v3
- uses: dmnemec/copy_file_to_another_repo_action@v1.1.1
env:
API_TOKEN_GITHUB: ${{secrets.TALAWA_DOCS_SYNC}}
with:
source_file: 'talawa-api-docs/'
destination_repo: 'PalisadoesFoundation/talawa-docs'
destination_branch: 'develop'
destination_folder: 'docs/'
user_email: '${{env.email}}'
user_name: '${{github.actor}}'
commit_message: 'Talawa API docs updated'

# Copy-docs-to-talawa-docs:
# runs-on: ubuntu-latest
# if: github.ref == 'refs/heads/automated-docs'
# # needs: Generate-Documentation
# steps:
# - uses: actions/checkout@v3
# - uses: dmnemec/copy_file_to_another_repo_action@v1.1.1
# env:
# API_TOKEN_GITHUB: ${{secrets.TALAWA_DOCS_SYNC}}
# with:
# source_file: 'talawa-api-docs/'
# destination_repo: 'PalisadoesFoundation/talawa-docs'
# destination_branch: 'develop'
# destination_folder: 'docs/'
# user_email: '${{env.email}}'
# user_name: '${{github.actor}}'
# commit_message: 'Talawa API docs updated'

# You can find the deployment instructions in the scripts/cloud-api-demo/README.md file
Deploy-Workflow:
name: Deploying Application to Cloud VPS
Expand Down
Loading

0 comments on commit 4c39066

Please sign in to comment.