Skip to content

Commit

Permalink
Merge branch 'ohcnetwork:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bodhish authored Jan 28, 2025
2 parents 878d357 + 0c3342f commit 6cc36b8
Show file tree
Hide file tree
Showing 285 changed files with 16,108 additions and 16,156 deletions.
94 changes: 0 additions & 94 deletions .eslintrc.json

This file was deleted.

3 changes: 3 additions & 0 deletions .example.env
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ REACT_DEFAULT_ENCOUNTER_TYPE=

# Available languages to switch between (2 Digit language code seperated by comas. See src->Locale->config.ts for available codes)
REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"

# ISO 3166-1 Alpha-2 code for the default country code (default: "IN")
REACT_DEFAULT_COUNTRY=
9 changes: 5 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
version: 2
updates:
- package-ecosystem: "yarn"
- package-ecosystem: npm
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 0
allow:
- dependency-name: "*"
dependency-type: "production"
assignees:
- "tomahawk_pilot"
labels:
- "yarn"
- "dependencies"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
assignees:
open-pull-requests-limit: 0
assignees:
- "tomahawk_pilot"
labels:
- "ci"
- "dependencies"
- "dependencies"
4 changes: 2 additions & 2 deletions .github/workflows/auto-testing-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:

jobs:
auto_label:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm

steps:
- name: Check PR Conditions and Add Label
id: check_conditions
uses: actions/github-script@v5
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/combine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ permissions:

jobs:
combine-prs:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm

steps:
- name: Combine dependencies
id: combine-dependencies
uses: github/combine-prs@v5.0.0
uses: github/combine-prs@v5.2.0
with:
pr_title: Combined dependencies # The title of the pull request to create
select_label: dependencies # The label which marks PRs that should be combined.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/comment-p1-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
jobs:
add-comment:
if: github.event.label.name == 'P1' && github.repository == 'ohcnetwork/care_fe'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
permissions:
issues: write
steps:
- name: Add comment
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
script: |
const body = ':warning: **Refrain from assigning this issue to yourself if you have another `P1` issue assigned that is not yet closed.**'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cypress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
cypress-run:
permissions: write-all
if: github.repository == 'ohcnetwork/care_fe'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
strategy:
fail-fast: false
matrix:
containers: [1]
env:
REACT_CARE_API_URL: https://care-api.do.ohc.network
REACT_CARE_API_URL: https://careapi.ohc.network

steps:
- name: Checkout 📥
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Determine PR Origin
id: pr_origin
Expand Down Expand Up @@ -77,15 +77,15 @@ jobs:
SPLIT_INDEX: ${{ strategy.job-index }}

- name: Upload cypress screenshots on failure 📸
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
path: cypress/screenshots

- name: Upload cypress videos 📹
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && steps.pr_origin.outputs.is_forked == 'true' }}
with:
name: cypress-videos
path: cypress/videos
path: cypress/videos
7 changes: 3 additions & 4 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
test:
if: github.repository == 'ohcnetwork/care_fe'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
name: Test
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
needs: test
if: github.ref == 'refs/heads/develop' || startsWith(github.event.ref, 'refs/tags/v')
name: Build & Push to container registries
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -133,9 +133,8 @@ jobs:
needs: build
if: startsWith(github.event.ref, 'refs/tags/v')
name: Notify release
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
steps:
- name: Notify release
run: |
echo "Release ${{ github.sha }} is ready to be deployed to production"
12 changes: 6 additions & 6 deletions .github/workflows/issue-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:
jobs:
issue_opened_and_reopened:
name: issue_opened_and_reopened
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
if: github.repository == 'ohcnetwork/care_fe' && github.event_name == 'issues' && github.event.action == 'opened' || github.event.action == 'reopened'
steps:
- name: 'Move issue to "Triage"'
uses: leonsteinhaeuser/project-beta-automations@v1.2.1
uses: leonsteinhaeuser/project-beta-automations@v1.3.0
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: ohcnetwork
Expand All @@ -22,11 +22,11 @@ jobs:
status_value: "Triage"
issue_closed:
name: issue_closed
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
if: github.repository == 'ohcnetwork/care_fe' && github.event_name == 'issues' && github.event.action == 'closed'
steps:
- name: 'Moved issue to "Done"'
uses: leonsteinhaeuser/project-beta-automations@v1.2.1
uses: leonsteinhaeuser/project-beta-automations@v1.3.0
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: ohcnetwork
Expand All @@ -35,11 +35,11 @@ jobs:
status_value: "Done"
issue_assigned:
name: issue_assigned
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
if: github.repository == 'ohcnetwork/care_fe' && github.event_name == 'issues' && github.event.action == 'assigned'
steps:
- name: 'Move issue to "In Progress"'
uses: leonsteinhaeuser/project-beta-automations@v1.2.1
uses: leonsteinhaeuser/project-beta-automations@v1.3.0
with:
gh_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
organization: ohcnetwork
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/label-deploy-failed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ on:

jobs:
auto-label-deploy-failed:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
if: |
github.repository == 'ohcnetwork/care_fe' && github.event.issue.pull_request &&
contains(github.event.comment.body, 'Deploy Preview')
steps:
- name: Add 'Deploy-Failed'
if: contains(github.event.comment.body, 'failed')
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
github.rest.issues.addLabels({
Expand All @@ -30,7 +30,7 @@ jobs:
- name: Remove 'Deploy-Failed' label
if: contains(github.event.comment.body, 'ready')
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
github.rest.issues.removeLabel({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label-merge-conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
auto-label:
if: github.repository == 'ohcnetwork/care_fe'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
steps:
- uses: prince-chrismc/label-merge-conflicts-action@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/label-wip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
check-linked-issues:
if: github.repository == 'ohcnetwork/care_fe'
name: Check linked issues
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
outputs:
linked_issues: ${{ steps.issue-output.outputs.linked_issues }}
steps:
Expand All @@ -26,13 +26,13 @@ jobs:

label-issues:
name: Label linked issues
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
needs: check-linked-issues
permissions: write-all
if: github.repository == 'ohcnetwork/care_fe' && join(needs.check-linked-issues.outputs.linked_issues) != ''
steps:
- name: Label
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const issues = "${{ needs.check-linked-issues.outputs.linked_issues }}".split(',')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
lint:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
permissions:
contents: read
packages: read
Expand All @@ -22,7 +22,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: "20"

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notify-non-core-qn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
notify_core_team:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
env:
ALLOWED_USERNAMES: ${{ vars.ALLOWED_USERNAMES || '' }}
QUESTION_KEYWORDS: ${{ vars.QUESTION_KEYWORDS || '' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
name: Release on Push
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Necessary to fetch all tags
fetch-depth: 0 # Necessary to fetch all tags

- name: Calculate next tag
id: calc_tag
Expand Down
Loading

0 comments on commit 6cc36b8

Please sign in to comment.