search

opencrvs / opencrvs-core

A global solution to civil registration
https://www.opencrvs.org
Other
79 stars 58 forks source link

🍒 Merge changes from PR #7146 to release-v1.5.0 #7195

Closed github-actions[bot] closed 1 week ago

github-actions[bot] commented 1 week ago

Automated PR to merge changes from develop to release-v1.5.0

I failed to cherry-pick the changes automatically because of the following:

  Auto-merging packages/commons/package.json
Auto-merging packages/commons/src/logger.ts
CONFLICT (content): Merge conflict in packages/commons/src/logger.ts
Auto-merging packages/config/src/config/database.ts
Auto-merging packages/config/src/handlers/application/applicationConfigHandler.ts
Auto-merging packages/config/src/handlers/forms/formsHandler.ts
CONFLICT (content): Merge conflict in packages/config/src/handlers/forms/formsHandler.ts
Auto-merging packages/config/src/server.ts
CONFLICT (content): Merge conflict in packages/config/src/server.ts
Auto-merging packages/gateway/src/features/OIDPUserInfo/utils.ts
Auto-merging packages/metrics/src/config/database.ts
Auto-merging packages/metrics/src/features/performance/viewRefresher.ts
Auto-merging packages/notification/src/database.ts
Auto-merging packages/search/src/elasticsearch/dbhelper.ts
CONFLICT (content): Merge conflict in packages/search/src/elasticsearch/dbhelper.ts
Auto-merging packages/user-mgnt/src/database.ts
Auto-merging packages/webhooks/src/database.ts
Auto-merging packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
CONFLICT (content): Merge conflict in packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
Auto-merging packages/workflow/src/features/registration/fhir/fhir-utils.ts
CONFLICT (content): Merge conflict in packages/workflow/src/features/registration/fhir/fhir-utils.ts
Auto-merging packages/workflow/src/features/registration/sms-notification-utils.ts
Auto-merging packages/workflow/src/features/registration/utils.ts
CONFLICT (content): Merge conflict in packages/workflow/src/features/registration/utils.ts
Auto-merging packages/workflow/src/records/handler/download.ts
error: could not apply dc318cf4c... only use hapi-pino in production, consolidate different logging modules under commons

To continue manually you can use these commands:

  git fetch origin auto-pr-release-v1.5.0-7146-31767:auto-pr-release-v1.5.0-7146-31767
  git fetch origin ocrvs-7074:ocrvs-7074

  git checkout auto-pr-release-v1.5.0-7146-31767
  git reset --hard HEAD~1  # Remove placeholder commit
  git cherry-pick f7d580244ced149453153f1fb527e4db103af24e..41f921a6bb3246fa7588a1936dd411f1f6278934