[internal] Update GitHub Actions workflow files

pulumi · Jul 17, 2024 · 808e528 · 808e528
1 parent b1c21f3
commit 808e528
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -165,7 +165,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 @@