Merge pull request #1214 from kubernetes-client/brendandburns-patch-2

Update generate-javascript.yml
kubernetes-client · Aug 23, 2023 · 6305ecd · 6305ecd
2 parents 872edd1 + 3c91987
commit 6305ecd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/workflows/generate-javascript.yml b/.github/workflows/generate-javascript.yml
@@ -33,6 +33,8 @@ jobs:
           git config --global user.name "Github Actions"
           git config --global user.email "<>"
           git cherry-pick --strategy=recursive -X theirs c557f7f
+          # apply https://github.com/kubernetes-client/gen/pull/237
+          git cherry-pick --strategy=recursive -X theirs 7edb192
           rm -rf gen/.git
       - name: Generate Branch Name
         run: |