diff --git a/.github/workflows/sec-auto-merge.yml b/.github/workflows/sec-auto-merge.yml deleted file mode 100644 index 181fdc01..00000000 --- a/.github/workflows/sec-auto-merge.yml +++ /dev/null @@ -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 diff --git a/renovate.json b/renovate.json index 8f3f0ab5..9b566dd4 100644 --- a/renovate.json +++ b/renovate.json @@ -20,7 +20,6 @@ "enabled": true, "automerge": true }, - "baseBranches": ["main", "sec"], "packageRules": [ { "matchUpdateTypes": ["minor", "patch", "pin", "digest"],