From ce8df9b94367cf6656bd62919c74843c16e65bc7 Mon Sep 17 00:00:00 2001 From: Pauli Jokela Date: Thu, 10 Aug 2023 14:03:47 +0300 Subject: [PATCH] Update action.yml [skip ci] Signed-off-by: Pauli Jokela --- .github/actions/sync-upstream/action.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/actions/sync-upstream/action.yml b/.github/actions/sync-upstream/action.yml index d47d1f783746..324d2610b05a 100644 --- a/.github/actions/sync-upstream/action.yml +++ b/.github/actions/sync-upstream/action.yml @@ -2,15 +2,19 @@ name: 'Sync Upstream' description: 'Force syncs a branch from an upstream repository.' inputs: branch: - description: 'Branch to sync. Optional, default is the current branch.' + description: 'Branch to sync. Optional, defaults to the currently checked out branch.' required: false upstream-repo: description: 'Upstream repository in the format owner/repo. Required, not set by default.' required: true + protected-branches: + description: 'Comma-separated list of branches that should not be synced. Defaults to "master,main,production".' + default: 'master,main,production' + required: false runs: using: 'composite' steps: - run: chmod +x ${{ github.action_path }}/sync.sh shell: bash - - run: ${{ github.action_path }}/sync.sh "${{ inputs.branch }}" "${{ inputs.upstream-repo }}" + - run: ${{ github.action_path }}/sync.sh "${{ inputs.branch }}" "${{ inputs.upstream-repo }}" "${{ inputs.protected-branches }}" shell: bash