mirror of
https://github.com/tj-actions/changed-files
synced 2024-06-28 21:06:58 +02:00
chore: delete sec-auto-merge.yml (#1161)
This commit is contained in:
parent
088aefc16a
commit
11b14aea27
33
.github/workflows/sec-auto-merge.yml
vendored
33
.github/workflows/sec-auto-merge.yml
vendored
|
@ -1,33 +0,0 @@
|
||||||
name: Auto merge and fix conflicts
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
automerge-sec:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: Auto merge and fix merge conflicts
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
persist-credentials: false
|
|
||||||
|
|
||||||
- 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
|
|
|
@ -20,7 +20,6 @@
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"automerge": true
|
"automerge": true
|
||||||
},
|
},
|
||||||
"baseBranches": ["main", "sec"],
|
|
||||||
"packageRules": [
|
"packageRules": [
|
||||||
{
|
{
|
||||||
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
|
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
|
||||||
|
|
Loading…
Reference in a new issue