Skip to content

Commit 47f31b9

Browse files
authored
Merge pull request #340 from nextstrain/nextstrain-bot/update-vendored
[bot] Update shared/vendored
2 parents d24a1c8 + 017e493 commit 47f31b9

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

shared/vendored/.github/workflows/update-downstream-repos.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
branches:
66
- main
77
workflow_dispatch:
8+
inputs:
9+
force:
10+
description: 'Pass --force to git subrepo pull'
11+
type: boolean
12+
required: false
13+
default: false
814

915
concurrency:
1016
group: ${{ github.workflow }}
@@ -106,7 +112,7 @@ jobs:
106112
git switch -c "$branch"
107113
fi
108114
109-
git subrepo pull "$VENDORED_PATH"
115+
git subrepo pull "$VENDORED_PATH" ${{ inputs.force && '--force' || '' }}
110116
111117
# Check for changes to determine if we need to create/update PRs
112118
changes=$(git rev-list --count "$parent".."$branch")
@@ -124,6 +130,8 @@ jobs:
124130
Subrepo changes may break workflows and require manual updates to
125131
fix errors. It is safe to add manual updates directly to this PR
126132
since they will not be overwritten by future automatic updates.
133+
134+
${{ inputs.force && 'Subrepo updates were made with the `--force` flag so it overwrites any local changes in the subrepo.' || '' }}
127135
run: |
128136
if [[ "$changes" == "1" ]]; then
129137
git push origin HEAD

shared/vendored/.gitrepo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/nextstrain/shared
88
branch = main
9-
commit = f70385349d2ad89ad65f474cb03b44fccd75d093
9+
commit = 9b91ad2885963b5596ef80f78db12c1f1f7577b7
1010
parent = f1fc8b9f6a1e05d4163f1f18f2a3cd716f59edbd
1111
method = merge
1212
cmdver = 0.4.9

0 commit comments

Comments
 (0)