Skip to content

ff-merge

ff-merge #55

Workflow file for this run

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 ${{ github.event.inputs.branch }} branch
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.branch }}
path: meta-aws
fetch-depth: 0
token: ${{ secrets.BOT_CREDENTIAL }}
- name: merge ${{ github.event.inputs.branch }}-next into ${{ github.event.inputs.branch }}
working-directory: meta-aws
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
run: |
git push -u origin ${{ github.event.inputs.branch }}