Skip to content

Commit

Permalink
chore: add sec auto merge action (#1037)
Browse files Browse the repository at this point in the history
  • Loading branch information
jackton1 authored Mar 20, 2023
1 parent 0bf905f commit 3d6f7aa
Showing 1 changed file with 32 additions and 0 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/sec-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Auto merge and fix conflicts
on:
push:
branches:
- main

jobs:
automerge and fix conflicts:
runs-on: ubuntu-latest
name: Auto merge and fix merge conflicts

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Fix merge conflicts
run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git checkout sec
git merge --no-edit --no-ff --strategy-option=ours main
- name: Push changes
uses: ad-m/github-push-action@master
continue-on-error: true
with:
github_token: ${{ secrets.PAT_TOKEN }}
branch: sec

0 comments on commit 3d6f7aa

Please sign in to comment.