diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..03028a8 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,31 @@ +# This is a basic workflow that is manually triggered + +name: Manual workflow + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: + push: + branches: + 'work-in-progress' + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "merge" + merge: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Runs a single command using the runners shell + - name: Up merge + # You may pin to the exact commit or the version. + # uses: bambamboole/gha-upmerge@de87b212278009f9ace0ba024701890b9eb3281b + uses: bambamboole/gha-upmerge@v1.0.1 + with: + # Name of the branch to merge from + from_branch: work-in-progress + + to_branch: main +