Skip to content

Commit

Permalink
Update ff-merge.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-roos committed Oct 21, 2024
1 parent 632f1c7 commit d920c6a
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions .github/workflows/ff-merge.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: ff-merge

on:
workflow_dispatch:
inputs:
branch:
description: 'branch to ff merge branch-next into'
default: 'master'
branches:
description: 'branches to ff merge branch-next into'
default: '["master", "dunfell", "gatesgarth", "hardknott", "honister", "kirkstone", "zeus", "langdale", "mickledore", "nanbield", "scarthgap", "styhead"]'
required: true

jobs:
ff-merge:
jobs:
ff-merge:
runs-on: ubuntu-22.04
strategy:
matrix:
branch: ${{ fromJson(github.event.inputs.branches) }}
fail-fast: false
steps:
- name: clone meta-aws ${{ github.event.inputs.branch }} branch
uses: actions/checkout@v4
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 }}
- name: clone meta-aws ${{ github.event.inputs.branches }} branch
uses: actions/checkout@v3
with:
ref: ${{ matrix.branch }}
path: meta-aws
fetch-depth: 0
token: ${{ secrets.BOT_CREDENTIAL }}
- name: merge ${{ matrix.branch }}-next into ${{ matrix.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/${{ matrix.branch }}-next
- name: push ${{ matrix.branch }}
working-directory: meta-aws
run: |
git push -u origin ${{ matrix.branch }}

0 comments on commit d920c6a

Please sign in to comment.