Skip to content

Commit 5519796

Browse files
committed
ff-merge: use security best practics
1 parent 1e51242 commit 5519796

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.github/workflows/ff-merge.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ jobs:
2222

2323
- name: merge ${{ github.event.inputs.branch }}-next into ${{ github.event.inputs.branch }}
2424
working-directory: meta-aws-demos
25+
env:
26+
BRANCH_NAME: ${{ github.event.inputs.branch }}
2527
run: |
2628
git config --global user.name aws-iot-embedded-linux-ci
2729
git config --global user.email [email protected]
28-
git merge --ff-only origin/${{ github.event.inputs.branch }}-next
30+
git merge --ff-only origin/${BRANCH_NAME}-next
2931
3032
- name: push ${{ github.event.inputs.branch }}
3133
working-directory: meta-aws-demos
34+
env:
35+
BRANCH_NAME: ${{ github.event.inputs.branch }}
3236
run: |
33-
git push -u origin ${{ github.event.inputs.branch }}
37+
git push -u origin ${BRANCH_NAME}
3438

0 commit comments

Comments
 (0)