diff options
| -rw-r--r-- | .github/mergify.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/pr-mirror-repo-sync.yml | 30 |
2 files changed, 15 insertions, 19 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 0000000..525594c --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,4 @@ +# yaml-language-server: $schema=https://docs.mergify.com/mergify-configuration-schema.json +extends: mergify +merge_protections_settings: + reporting_method: check-runs diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml index 7741a36..0f16633 100644 --- a/.github/workflows/pr-mirror-repo-sync.yml +++ b/.github/workflows/pr-mirror-repo-sync.yml @@ -1,35 +1,27 @@ +# .github/workflows/pr-mirror-repo-sync.yml +# DO NOT EDIT — managed by mirror-pipeline rollout. +# To opt out: set vars.MIRROR_ENABLED=false in this repo's Actions variables. name: PR Mirror and Repo Sync on: pull_request_target: types: [closed] - branches: [rolling] + branches: [rolling, production] workflow_dispatch: inputs: sync_branch: - description: 'Branch to mirror' required: true - default: 'rolling' - type: choice - options: - - rolling + type: string permissions: - pull-requests: write - contents: write - issues: write + contents: read jobs: - call-pr-mirror-repo-sync: + call: if: | - github.repository_owner == 'vyos' && - ( - github.event_name == 'workflow_dispatch' || - (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true) - ) + github.repository_owner == 'vyos' + && (github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch') uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@production with: - sync_branch: ${{ github.event.inputs.sync_branch || 'rolling' }} - secrets: - PAT: ${{ secrets.PAT }} - REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }} + sync_branch: ${{ inputs.sync_branch || github.event.pull_request.base.ref }} + secrets: inherit |