File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 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
915concurrency :
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
Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments