Skip to content

Commit

Permalink
Update sync-upstream.yml
Browse files Browse the repository at this point in the history
Signed-off-by: Pauli Jokela <[email protected]>
  • Loading branch information
Dids authored Aug 10, 2023
1 parent 4c28c31 commit bfee2b3
Showing 1 changed file with 27 additions and 20 deletions.
47 changes: 27 additions & 20 deletions .github/workflows/sync-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,33 @@ jobs:
# No need to persist credentials in this case
persist-credentials: false

# Sync upstream repository (with automatic retry support)
# Sync upstream repository
- name: Sync Upstream Repository
id: sync
#uses: Wandalen/wretry.action@master
uses: Wandalen/[email protected]
uses: ./.github/actions/sync-upstream
with:
# Attempt 3 times before giving up
attempt_limit: 3
# Delay each attempt by 1 minute
attempt_delay: 60000
# The action to run and retry on failure
action: aormsby/[email protected]
# The arguments for the retry action above
with: |
upstream_sync_repo: bigtreetech/CB1-Kernel
upstream_sync_branch: ${{ github.event.inputs.ref || 'kernel-5.16' }}
upstream_pull_args: '-s recursive -Xtheirs --allow-unrelated-histories --unshallow'
target_sync_branch: ${{ github.event.inputs.ref || 'kernel-5.16' }}
target_branch_push_args: '--force --all'
target_repo_token: ${{ secrets.GITHUB_TOKEN }}
shallow_since: '6 months ago'
git_config_pull_rebase: true
test_mode: false
upstream-repo: bigtreetech/CB1-Kernel

# Sync upstream repository (with automatic retry support)
#- name: Sync Upstream Repository
# id: sync
# #uses: Wandalen/wretry.action@master
# uses: Wandalen/[email protected]
# with:
# # Attempt 3 times before giving up
# attempt_limit: 3
# # Delay each attempt by 1 minute
# attempt_delay: 60000
# # The action to run and retry on failure
# action: aormsby/[email protected]
# # The arguments for the retry action above
# with: |
# upstream_sync_repo: bigtreetech/CB1-Kernel
# upstream_sync_branch: ${{ github.event.inputs.ref || 'kernel-5.16' }}
# upstream_pull_args: '-s recursive -Xtheirs --allow-unrelated-histories --unshallow'
# target_sync_branch: ${{ github.event.inputs.ref || 'kernel-5.16' }}
# target_branch_push_args: '--force --all'
# target_repo_token: ${{ secrets.GITHUB_TOKEN }}
# shallow_since: '6 months ago'
# git_config_pull_rebase: true
# test_mode: false

0 comments on commit bfee2b3

Please sign in to comment.