From daf857a8633934d619a21f3f43947adc06d881e7 Mon Sep 17 00:00:00 2001
From: Saikrishna Bairamoni
 <84093461+SaikrishnaBairamoni@users.noreply.github.com>
Date: Tue, 26 Nov 2024 13:41:34 -0500
Subject: [PATCH] Auto Merge develop to develop-humble (#32)

<!-- Thanks for the contribution, this is awesome. -->

# PR Details
This PR introduces a workflow auto-merge-workflow.yml to handle the auto
merging of develop changes into develop humble branch weekly and send
notification to DevOps team when there are merge conflicts. This
workflow uses reusable actions merge-develop-humble.yml.
## Description

<!--- Describe your changes in detail -->

## Related GitHub Issue

<!--- This project only accepts pull requests related to open GitHub
issues or Jira Keys -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please DO NOT name partially fixed issues, instead open an issue
specific to this fix -->
<!--- Please link to the issue here: -->

## Related Jira Key

[ARC-247](https://usdot-carma.atlassian.net/browse/ARC-247)

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the
[**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.


[ARC-247]:
https://usdot-carma.atlassian.net/browse/ARC-247?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
---
 .github/workflows/auto-merge-workflow.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/auto-merge-workflow.yml

diff --git a/.github/workflows/auto-merge-workflow.yml b/.github/workflows/auto-merge-workflow.yml
new file mode 100644
index 00000000..b071183c
--- /dev/null
+++ b/.github/workflows/auto-merge-workflow.yml
@@ -0,0 +1,14 @@
+name: Auto Merge develop to develop-humble
+
+on:
+  schedule:
+    - cron: '0 0 * * 1'  # Weekly on Monday
+  workflow_dispatch:  
+
+jobs:
+  call-merge-workflow:
+    uses: usdot-fhwa-stol/actions/.github/workflows/auto-pr-merge.yml@main
+    with:
+      branch_from: develop
+      branch_to: develop-humble
+      notify_team: DevOps