mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-07-18 03:23:07 +01:00
Run master merge on master pushes
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
name: 'Master Merge'
|
||||
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: [CI Pipeline]
|
||||
types:
|
||||
- completed
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
@@ -13,7 +12,6 @@ env:
|
||||
jobs:
|
||||
master-merge:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
Reference in New Issue
Block a user