Skip to content

Commit b5f5259

Browse files
Update generate-javascript.yml
1 parent ba985e5 commit b5f5259

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

.github/workflows/generate-javascript.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ jobs:
3030
pushd gen
3131
git checkout "${{ github.event.inputs.genCommit }}"
3232
# apply https://github.com/kubernetes-client/gen/pull/224
33+
# apply https://github.com/kubernetes-client/gen/pull/237
3334
git config --global user.name "Github Actions"
3435
git config --global user.email "<>"
35-
git cherry-pick --strategy=recursive -X theirs c557f7f
36-
# apply https://github.com/kubernetes-client/gen/pull/237
37-
git cherry-pick --strategy=recursive -X theirs 7edb192
36+
git cherry-pick --strategy=recursive -X theirs c557f7f 7edb192
3837
rm -rf gen/.git
3938
- name: Generate Branch Name
4039
run: |

0 commit comments

Comments
 (0)