Skip to content

ff-merge

ff-merge #28

Workflow file for this run

name: ff-merge
on:
workflow_dispatch:
inputs:
branches:
description: 'branches/all to ff merge branch-next into (separate by blank only)'
default: 'master dunfell gatesgarth hardknott honister kirkstone zeus langdale mickledore nanbield scarthgap styhead'
required: true
jobs:
ff-merge:
runs-on: ubuntu-22.04
steps:
- name: clone, ff, push
shell: bash
run: |
git config --global user.name aws-iot-embedded-linux-ci
git config --global user.email aws-iot-embedded-linux-ci@users.noreply.github.com
for branch in ${{ github.event.inputs.branches }}; do
echo Doing ff-merge for: ${branch}
git clone https://${{ secrets.BOT_CREDENTIAL }}@github.com/${{ github.repository }}.git -b ${branch}
cd meta-aws
git merge --ff-only origin/${branch}-next
cd ..
rm -rf meta-aws
done