Update GitHub Actions workflows. (#534)

This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit d7c62aa3eaa24dc23f8ef7b72eb075da9fcb07e2.
pulumi · Jul 17, 2024 · ce6ff6a · ce6ff6a
1 parent f722e3d
commit ce6ff6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -166,7 +166,7 @@ tfgen_build_only:
 
 upstream:
 ifneq ("$(wildcard upstream)","")
-	./upstream.sh init
+	./upstream.sh init -f
 endif
 
 bin/pulumi-java-gen: .pulumi-java-gen.version

diff --git a/upstream.sh b/upstream.sh
@@ -97,7 +97,7 @@ Either stage or reset the 'upstream' submodule changes before continuing:
 
     git add upstream
     # or #
-    git checkout upstream
+    (cd upstream && git checkout <current submodule commit of origin/default> && cd -)
 
 EOF
     exit 1
-Original file line number
+Diff line change
@@ Expand Up @@
         git add upstream
         # or #
-        git checkout upstream
+        (cd upstream && git checkout <current submodule commit of origin/default> && cd -)
     EOF
         exit 1
@@ Expand Down @@