Skip to content

Commit

Permalink
Merge branch 'renovate/webpack-5.x' of github.com:ckotzbauer/ckotzbau…
Browse files Browse the repository at this point in the history
…er.github.io into renovate/webpack-5.x

Signed-off-by: Christian Kotzbauer <christian.kotzbauer@gmail.com>
  • Loading branch information
ckotzbauer committed Oct 11, 2020
2 parents 9cef037 + feabd4e commit cebb8ee
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,17 @@ jobs:
MERGE_METHOD: "rebase"
MERGE_DELETE_BRANCH: "true"

- name: Workflow Dispatch
if: github.event.pull_request.merged
- uses: octokit/request-action@v2.x
id: get_pullrequest
with:
route: GET /repos/:repository/pulls/:pr_number
repository: ${{ github.repository }}
pr_number: ${{ github.event.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: start deployment
if: fromJson(steps.get_pullrequest.outputs.data).state == 'closed'
uses: benc-uk/workflow-dispatch@v1
with:
workflow: deploy
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cebb8ee

Please sign in to comment.