This repository has been archived on 2024-09-05. You can view files and clone it, but cannot push or open issues or pull requests.
shimmie2/.github/workflows/main.yml

27 lines
711 B
YAML
Raw Normal View History

2023-07-03 13:54:50 +00:00
name: Master to Main
on:
workflow_run:
workflows: Tests
branches: master
types: completed
workflow_dispatch:
jobs:
merge-master-to-main:
if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
2024-08-31 16:05:18 +00:00
runs-on: ubuntu-24.04
2023-07-03 13:54:50 +00:00
steps:
2024-02-12 13:51:11 +00:00
- uses: actions/checkout@v4
2023-07-03 13:54:50 +00:00
- name: Set Git config
run: |
git config --local user.email "actions@github.com"
git config --local user.name "Github Actions"
- name: Merge master back to dev
run: |
git fetch --unshallow
git checkout main
git pull
2023-07-03 14:23:53 +00:00
git merge --ff origin/master -m "Auto-merge master to main"
2023-07-03 13:54:50 +00:00
git push