Skip to content

Commit 9e82be1

Browse files
authored
Update GitHub Actions workflows. (#529)
This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit d7c62aa3eaa24dc23f8ef7b72eb075da9fcb07e2.
1 parent 9d9481d commit 9e82be1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ tfgen_build_only:
163163

164164
upstream:
165165
ifneq ("$(wildcard upstream)","")
166-
./upstream.sh init
166+
./upstream.sh init -f
167167
endif
168168

169169
bin/pulumi-java-gen: .pulumi-java-gen.version

upstream.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Either stage or reset the 'upstream' submodule changes before continuing:
9797
9898
git add upstream
9999
# or #
100-
git checkout upstream
100+
(cd upstream && git checkout <current submodule commit of origin/default> && cd -)
101101
102102
EOF
103103
exit 1

0 commit comments

Comments
 (0)