Skip to content

Commit e1f6602

Browse files
thealphacubicleSrihari Raman
andauthored
* Removed redundant files * Github action to prevent divergent branching on PR to main --------- Co-authored-by: Srihari Raman <raman.sr@northeastern.edu>
1 parent 1f4fe36 commit e1f6602

1 file changed

Lines changed: 33 additions & 0 deletions

File tree

.github/workflows/sync-develop.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
# Sync develop with main after main is updated (e.g., after merging a PR).
3+
# This prevents main and develop from diverging.
4+
name: Sync develop with main
5+
6+
on:
7+
push:
8+
branches:
9+
- main
10+
11+
permissions:
12+
contents: write
13+
14+
jobs:
15+
sync:
16+
name: Merge main into develop
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
23+
24+
- name: Configure Git
25+
run: |
26+
git config user.name "github-actions[bot]"
27+
git config user.email "github-actions[bot]@users.noreply.github.com"
28+
29+
- name: Merge main into develop
30+
run: |
31+
git checkout develop
32+
git merge main -m "chore: sync develop with main"
33+
git push origin develop

0 commit comments

Comments
 (0)