Skip to content

Commit

Permalink
[internal] Update GitHub Actions workflow files
Browse files Browse the repository at this point in the history
  • Loading branch information
@pulumi-bot
pulumi-bot committed Aug 28, 2023
1 parent 4441db3 commit 83f6305
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
VERSION := $(shell pulumictl get version)
JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := v0.9.5
JAVA_GEN_VERSION := v0.5.4
TESTPARALLELISM := 10
WORKING_DIR := $(shell pwd)

Expand Down
6 changes: 5 additions & 1 deletion scripts/upstream.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@ start_rebase() {
fi

git branch -f local
git checkout -B pulumi-patch "${FROM}"
if [ -n "$FROM" ]; then
git checkout -B pulumi-patch "$FROM"
else
git checkout -B pulumi-patch
fi
git branch --set-upstream-to=local pulumi-patch

for patch in ../patches/*.patch; do
Expand Down

0 comments on commit 83f6305

Please sign in to comment.