-
Notifications
You must be signed in to change notification settings - Fork 22
34 lines (29 loc) · 1 KB
/
ff-merge.yml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
name: ff-merge
on:
workflow_dispatch:
inputs:
branch:
description: 'branch to ff merge branch-next into'
default: 'master'
required: true
jobs:
ff-merge:
runs-on: ubuntu-latest
steps:
- name: clone meta-aws-demos ${{ github.event.inputs.branch }} branch
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.branch }}
path: meta-aws-demos
submodules: true
fetch-depth: 0
- name: merge ${{ github.event.inputs.branch }}-next into ${{ github.event.inputs.branch }}
working-directory: meta-aws-demos
run: |
git config --global user.name aws-iot-embedded-linux-ci
git config --global user.email [email protected]
git merge --ff-only origin/${{ github.event.inputs.branch }}-next
- name: push ${{ github.event.inputs.branch }}
working-directory: meta-aws-demos
run: |
git push -u origin ${{ github.event.inputs.branch }}