Skip to content

Commit 175997d

Browse files
committed
feat: Change to using composite run instead of Docker
https://docs.github.com/en/actions/creating-actions/creating-a-composite-run- steps-action
1 parent 3fdb07b commit 175997d

File tree

3 files changed

+8
-20
lines changed

3 files changed

+8
-20
lines changed

Dockerfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

action.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ inputs:
1010
description: 'Upstream repository owner/name. For example, exions/merge-upstream'
1111
required: true
1212
branch:
13-
description: 'This branch to merge from and to. For example, master'
13+
description: 'Branch to merge to. For example, master'
1414
default: 'master'
1515

1616
runs:
17-
using: 'docker'
18-
image: 'Dockerfile'
19-
args:
20-
- ${{ inputs.upstream }}
21-
- ${{ inputs.branch }}
17+
using: "composite"
18+
steps:
19+
- run: |
20+
git remote add -f upstream "https://github.com/${{ inputs.upstream }}.git"
21+
git merge --ff-only upstream/${{ inputs.branch }}
22+
git push
23+
shell: bash

entrypoint.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)