Update ff-merge.yml

thomas-roos · Oct 21, 2024 · be9783c · be9783c
1 parent 339d8d2
commit be9783c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/ff-merge.yml b/.github/workflows/ff-merge.yml
@@ -17,17 +17,17 @@ jobs:
        - name: clone meta-aws ${{ github.event.inputs.branch }} branch
          uses: actions/checkout@v3
          with:
-           ref: ${{ github.event.inputs.branch }}
+           ref: ${{ matrix.branch }}
            path: meta-aws
            fetch-depth: 0
            token: ${{ secrets.BOT_CREDENTIAL }}
-       - name: merge ${{ github.event.inputs.branch }}-next into ${{ github.event.inputs.branch }}
+       - 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 aws-iot-embedded-linux-ci@users.noreply.github.com
-           git merge --ff-only origin/${{ github.event.inputs.branch }}-next
-       - name: push ${{ github.event.inputs.branch }}
+           git merge --ff-only origin/${{ matrix.branch }}-next
+       - name: push ${{ matrix.branch }}
          working-directory: meta-aws
          run: |
-           git push -u origin ${{ github.event.inputs.branch }}
+           git push -u origin ${{ matrix.branch }}