3
0
Fork 0
mirror of https://github.com/tj-actions/changed-files synced 2025-02-22 11:17:38 +00:00

chore: add sec auto merge action (#1037)

This commit is contained in:
Tonye Jack 2023-03-20 12:53:48 -06:00 committed by GitHub
parent 0bf905f9c5
commit 3d6f7aa7fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

32
.github/workflows/sec-auto-merge.yml vendored Normal file
View file

@ -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