Skip to content
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

Merge Develop onto Main #455

Merged
merged 5 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
# This file contains the configs for dependabot.
# See for more info: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
Expand All @@ -11,5 +9,21 @@ updates:
interval: "weekly"
time: "09:00"
timezone: "Europe/London"
target-branch: "develop"


# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
# Workflow files stored in the default location of `.github/workflows`.
# (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
directory: "/"
schedule:
interval: "weekly"
time: "09:00"
timezone: "Europe/London"

# Maintain dependencies for dev containers
- package-ecosystem: "devcontainers"
directory: "/"
schedule:
interval: "weekly"
time: "09:00"
timezone: "Europe/London"
16 changes: 16 additions & 0 deletions .github/workflows/community-first-pr-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This workflow comments on PRs opened by first time contributors.
# Reminds first timer contributors to associate their PR with an issue and follow the guidelines.
# See for more info: https://github.com/actions/first-interaction

name: First Interaction PR Comment

on: [pull_request]

jobs:
greeting:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-message: "First time contributors to Chayn: Please make sure that this PR is linked to an issue you are assigned! We will not merge contributor PRs without a linked assigned issue. Please ask to be assigned an existing issue or create your own before opening a PR. Read our Contributing Guidelines in the CONTRIBUTING.md file for more details. Thank you for your contribution!"
35 changes: 35 additions & 0 deletions .github/workflows/community-issue-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This workflow handles issue comments.

name: Issue Assignee Comment

on:
issues:
types:
- assigned
- labeled

jobs:
# When issues are assigned, a comment is posted
# Tags the assignee with links to helpful resources
# See for more info: https://github.com/actions/github-script
assigned-comment:
runs-on: ubuntu-latest
steps:
- name: Post assignee issue comment
id: assigned-comment
uses: actions/github-script@v7
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: `Thank you @${context.payload.issue.assignee.login} you have been assigned this issue!
**Please follow the directions in our [Contributing Guide](https://github.com/chaynHQ/.github/blob/main/docs/CONTRIBUTING.md). We look forward to reviewing your pull request shortly ✨**

---

Support Chayn's mission? ⭐ Please star this repo to help us find more contributors like you!
Learn more about Chayn [here](https://linktr.ee/chayn) and [explore our projects](https://org.chayn.co/projects). 🌸`
})
44 changes: 44 additions & 0 deletions .github/workflows/community-stale-management.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This workflow labels stale issues and PRs after 30 days of inactivity.
# Stale PRs are closed after 1 week of inactivity after labeled stale.
# See for more info: https://github.com/actions/stale

name: Mark Stale Contributions

on:
# Enable manual run from the Actions tab so workflow can be run at any time
workflow_dispatch:
# Scheduled to run at 12:00 on every Monday
schedule:
- cron: "0 0 * * MON"

jobs:
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-label: "stale"
stale-pr-label: "stale"
days-before-stale: 30
# disables closing issues
days-before-issue-close: -1
# close pr after 1 week no updates after stale warning
days-before-pr-close: 7
# only scan assigned issues
include-only-assigned: true
# ignore issues assigned to staff and bots
exempt-assignees: "kyleecodes, swetha-charles, eleanorreem, annarhughes, tarebyte, dependabot[bot], dependabot, github-actions[bot], github-actions"
# disable removing stale label due to irrelevant activity (like branch updates)
remove-stale-when-updated: false
# exempt dependabot prs from going stale
exempt-pr-labels: dependencies
# disable counting irrelevant activity (branch updates) towards day counter on prs.
ignore-pr-updates: true
stale-pr-message: "As per Chayn policy, after 30 days of inactivity, we will close this PR."
close-pr-message: "This PR has been closed due to inactivity."
stale-issue-message: "As per Chayn policy, after 30 days of inactivity, we will be unassigning this issue. Please comment to stay assigned."
31 changes: 0 additions & 31 deletions .github/workflows/create-dependabot-issues.yml

This file was deleted.

28 changes: 28 additions & 0 deletions .github/workflows/dependabot-open-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This workflow opens issues for pull requests opened by dependabot.
# See for more info: https://github.com/actions/dependency-review-action

name: Open Dependabot Issues # from pull requests

on:
pull_request:
types: [opened]
branches: [develop]

jobs:
create-issue:
runs-on: ubuntu-latest
permissions:
issues: write
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
steps:
- name: Create issue
uses: actions-cool/issues-helper@v3
with:
actions: "create-issue"
token: ${{ secrets.GITHUB_TOKEN }}
title: ${{ github.event.pull_request.title }}
body: |
### Dependabot opened a pull request to update a dependency. Please review it: ${{ github.event.pull_request.html_url }}
- [ ] Comment on this issue tagging Chayn staff (@kyleecodes) to be assigned this issue.
- [ ] Follow directions in the Chayn Dependency Upgrade Guide here: https://chayn.notion.site/Chayn-Tech-Contributor-Wiki-5356c7118c134863a2e092e9df6cbc34?pvs=4
labels: "dependencies"
22 changes: 22 additions & 0 deletions .github/workflows/dependabot-pr-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This workflow enables dependency scans on pull requests.
# When changes in dependencies are detected, it will raise an error
# if any vulnerabilities or invalid licenses are introduced.
# See for more info: https://github.com/actions/dependency-review-action

name: "Dependency Review"
on: [pull_request]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: "Checkout Repository"
uses: actions/checkout@v4
- name: "Dependency Review"
uses: actions/dependency-review-action@v4
with:
# fails when moderate vulnerabilities are deteched
fail-on-severity: moderate
23 changes: 0 additions & 23 deletions .github/workflows/new-assignee-comment.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/stale-issue-management.yml

This file was deleted.

1 change: 0 additions & 1 deletion src/utils/serviceUserProfiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ export const createServiceUserProfiles = async (
logger.log(`Create user: updated service user profiles. User: ${email}`);
} catch (error) {
logger.error(`Create service user profiles error - ${error}. User: ${email}`);
throw error;
}
};

Expand Down
Loading