We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3fdb07b commit 175997dCopy full SHA for 175997d
Dockerfile
action.yml
@@ -10,12 +10,14 @@ inputs:
10
description: 'Upstream repository owner/name. For example, exions/merge-upstream'
11
required: true
12
branch:
13
- description: 'This branch to merge from and to. For example, master'
+ description: 'Branch to merge to. For example, master'
14
default: 'master'
15
16
runs:
17
- using: 'docker'
18
- image: 'Dockerfile'
19
- args:
20
- - ${{ inputs.upstream }}
21
- - ${{ inputs.branch }}
+ using: "composite"
+ steps:
+ - run: |
+ git remote add -f upstream "https://github.com/${{ inputs.upstream }}.git"
+ git merge --ff-only upstream/${{ inputs.branch }}
22
+ git push
23
+ shell: bash
entrypoint.sh
0 commit comments