Update main.yml
This commit is contained in:
parent
04c93c68da
commit
68460611d8
23
.github/workflows/main.yml
vendored
23
.github/workflows/main.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
|||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
ref: automation-test-master # todo change to master
|
ref: master
|
||||||
- name: Set output variables
|
- name: Set output variables
|
||||||
id: vars
|
id: vars
|
||||||
run: |
|
run: |
|
||||||
@ -31,19 +31,20 @@ jobs:
|
|||||||
git checkout -b ${{ steps.vars.outputs.branch }}
|
git checkout -b ${{ steps.vars.outputs.branch }}
|
||||||
git merge origin/develop
|
git merge origin/develop
|
||||||
git push --set-upstream origin ${{ steps.vars.outputs.branch }}
|
git push --set-upstream origin ${{ steps.vars.outputs.branch }}
|
||||||
- name: Show merge commit
|
- name: Develop PR
|
||||||
run: git --no-pager show
|
|
||||||
- name: pull-request
|
|
||||||
uses: repo-sync/pull-request@v2
|
uses: repo-sync/pull-request@v2
|
||||||
with:
|
with:
|
||||||
source_branch: ${{ steps.vars.outputs.branch }}
|
source_branch: ${{ steps.vars.outputs.branch }}
|
||||||
destination_branch: develop
|
destination_branch: develop
|
||||||
pr_title: "${{ steps.vars.outputs.branch }}"
|
pr_title: "Develop ${{ steps.vars.outputs.branch }}"
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
pr_allow_empty: true
|
pr_allow_empty: true
|
||||||
- name: output-url
|
- name: Master PR
|
||||||
run: echo ${{steps.open-pr.outputs.pr_url}}
|
uses: repo-sync/pull-request@v2
|
||||||
- name: output-number
|
with:
|
||||||
run: echo ${{steps.open-pr.outputs.pr_number}}
|
source_branch: ${{ steps.vars.outputs.branch }}
|
||||||
- name: output-has-changed-files
|
destination_branch: master
|
||||||
run: echo ${{steps.open-pr.outputs.has_changed_files}}
|
pr_title: "Master ${{ steps.vars.outputs.branch }}"
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
pr_allow_empty: true
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user