Merge branch 'develop' into issue/10158/patient-user-card-fix

ohcnetwork · Jan 31, 2025 · 710b57f · 710b57f
2 parents 3c7cf72 + 6f77a69
commit 710b57f
Show file tree

Hide file tree

Showing 113 changed files with 1,020 additions and 4,384 deletions.
diff --git a/.github/workflows/auto-testing-label.yml b/.github/workflows/auto-testing-label.yml
diff --git a/.github/workflows/combine.yml b/.github/workflows/combine.yml
diff --git a/.github/workflows/comment-p1-issues.yml b/.github/workflows/comment-p1-issues.yml
diff --git a/.github/workflows/label-deploy-failed.yml b/.github/workflows/label-deploy-failed.yml
diff --git a/.github/workflows/label-merge-conflict.yml b/.github/workflows/label-merge-conflict.yml
@@ -24,5 +24,6 @@ jobs:
           wait_ms: 15000
           detect_merge_changes: false
           conflict_comment: |
-            :wave: Hi, @${author},
             Conflicts have been detected against the base branch. Please rebase your branch against the base branch.
+            cc: @${author}
+            > _See: https://docs.ohc.network/docs/contributing#how-to-resolve-merge-conflicts_
diff --git a/.github/workflows/label-wip.yml b/.github/workflows/label-wip.yml
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - develop
-      - master
   merge_group:
 
 jobs:
@@ -22,7 +21,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
 
       - name: Install dependencies
         run: npm ci