From 2e02542b9f997b2091fb94d29133cb48bb35e882 Mon Sep 17 00:00:00 2001
From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com>
Date: Tue, 16 Jul 2024 23:05:25 -0700
Subject: [PATCH] Update GitHub Actions workflows. (#2229)

This PR was automatically generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit d7c62aa3eaa24dc23f8ef7b72eb075da9fcb07e2.
---
 Makefile    | 2 +-
 upstream.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 01c118692e..a10e74e055 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,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
index d285aaa730..f56ca1a5e1 100755
--- 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