Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add automerge.yml #662

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+30 −0
Open

Add automerge.yml #662

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
442bc3b
Add automerge.yml fix #657
ManuelJNunez Feb 21, 2024
8e71911
change variable name #657
ManuelJNunez Feb 21, 2024
4355022
add final carry return #657
ManuelJNunez Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Automerge

on:
workflow_dispatch:
schedule:
- cron: '0 0/12 * * *'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This workflow will be executed every 12 hours.


env:
REPO: https://rticommunity:${{secrets.GITHUB_TOKEN}}@github.com/rticommunity/rticonnextdds-examples.git

DESTINATION_BRANCH: develop

MASTER_REPO: https://github.com/rticommunity/rticonnextdds-examples.git

SOURCE_BRANCH: release/7.3.0

jobs:
merge:
runs-on: ubuntu-latest

steps:
- name: Merge with master
run: |
git clone ${{env.REPO}} -b ${{env.DESTINATION_BRANCH}} tmp
cd tmp
git config user.name "Automerge Bot"
git config user.email "bot@example.com"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what email to use... maybe automerge@rti.com?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexcamposruiz @fgaranda

git config pull.rebase false
git pull ${{env.MASTER_REPO}} ${{env.SOURCE_BRANCH}}
git push