Merge branch 'main' into feat/rule-builder

Author: NethmiRodrigo

.github/workflows/tx-pull.yml

@@ -23,11 +23,22 @@ jobs:
           token: ${{ secrets.TRANSIFEX_TOKEN }}
           args: pull --force --all
       - name: Create PR if necessary
-        uses: peter-evans/[email protected]
+        id: cpr
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: "(chore) Update translations from Transifex"
           title: "(chore) Update translations from Transifex"
           body: "Automated updates of translations pulled from Transifex"
           branch: "chore/update-transifex"
           author: "OpenMRS Bot <[email protected]>"
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.OMRS_BOT_GH_TOKEN }}
+      - name: ✅ Auto approve PR
+        if: steps.cpr.outputs.pull-request-operation == 'created' || steps.cpr.outputs.pull-request-operation == 'updated'
+        run: gh pr review --approve "${{ steps.cpr.outputs.pull-request-number }}"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: 🔀 Automerge PR
+        if: steps.cpr.outputs.pull-request-operation == 'created' || steps.cpr.outputs.pull-request-operation == 'updated'
+        run: gh pr merge --auto --squash "${{ steps.cpr.outputs.pull-request-number }}"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update-deps.yml

@@ -42,14 +42,14 @@ jobs:
             Update OpenMRS dependencies
           branch: 'chore/update-openmrs-deps'
           author: 'OpenMRS Bot <[email protected]>'
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.OMRS_BOT_GH_TOKEN }}
       - name: ✅ Auto approve PR
-        if: steps.cpr.outputs.pull-request-operation == 'created'
+        if: steps.cpr.outputs.pull-request-operation == 'created' || steps.cpr.outputs.pull-request-operation == 'updated'
         run: gh pr review --approve "${{ steps.cpr.outputs.pull-request-number }}"
         env:
-          GH_TOKEN: ${{ secrets.OMRS_BOT_GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 🔀 Automerge PR
-        if: steps.cpr.outputs.pull-request-operation == 'created'
+        if: steps.cpr.outputs.pull-request-operation == 'created' || steps.cpr.outputs.pull-request-operation == 'updated'
         run: gh pr merge --auto --squash "${{ steps.cpr.outputs.pull-request-number }}"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

yarn.lock

@@ -3372,8 +3372,8 @@ __metadata:
   linkType: soft
 
 "@openmrs/esm-form-engine-lib@npm:next":
-  version: 3.1.4-pre.1777
-  resolution: "@openmrs/esm-form-engine-lib@npm:3.1.4-pre.1777"
+  version: 3.1.4-pre.1779
+  resolution: "@openmrs/esm-form-engine-lib@npm:3.1.4-pre.1779"
   dependencies:
     "@carbon/react": "npm:^1.76.0"
     classnames: "npm:^2.5.1"
@@ -3391,7 +3391,7 @@ __metadata:
     react: 18.x
     react-i18next: 11.x
     swr: 2.x
-  checksum: 10/ea4637d7454de33089eb5476a7478a4e8b417696935ffa98c0832e02538d12b8d7045250148780e682e360501eae8c28ca85bf551efdd95941df62fd6369010b
+  checksum: 10/f60963f86ce2be16aecabaa301e336a1cbfa8c4c3d139c8091c4edc5673ddc1acd4377f4cd76c8b213c3e6c1dd86ac1e5f1eef433ce61b50e8a6a068a7a95cc1
   languageName: node
   linkType: hard
 
@@ -3470,8 +3470,8 @@ __metadata:
   linkType: hard
 
 "@openmrs/esm-patient-common-lib@npm:next":
-  version: 9.2.3-pre.7268
-  resolution: "@openmrs/esm-patient-common-lib@npm:9.2.3-pre.7268"
+  version: 9.2.3-pre.7283
+  resolution: "@openmrs/esm-patient-common-lib@npm:9.2.3-pre.7283"
   dependencies:
     "@carbon/react": "npm:^1.76.0"
     lodash-es: "npm:^4.17.21"
@@ -3480,7 +3480,7 @@ __metadata:
     "@openmrs/esm-framework": 6.x
     react: 18.x
     single-spa: 6.x
-  checksum: 10/3180e6c5d6cbdc06294aca0d8cf0ccb1bbcc9975ea9c1243b327a3bf7dc20cc67b851ed5caab22b472b7794eacb9fcd240a3fc72621c29ca4a27606d6f8817fc
+  checksum: 10/0ed654e96b3ee5c347d62221c209400b340a426ceeb399738afb62ddd5a78d502b22b9f7d702500b2125ed535e8a0ba8d4336982f97fca13315d5333daa68bab
   languageName: node
   linkType: hard