Skip to content

Commit

Permalink
Migrate to automated Java update format. Adds new version file for ja…
Browse files Browse the repository at this point in the history
…va gen and edits Makefile.
  • Loading branch information
guineveresaenger committed Dec 12, 2023
1 parent f89dbec commit d26ea07
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion .ci-mgmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ major-version: 3
docker: true
makeTemplate: bridged
team: ecosystem
javaGenVersion: "v0.9.5"
1 change: 1 addition & 0 deletions .pulumi-java-gen.version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.9.8
1 change: 0 additions & 1 deletion .upgrade-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ upstream-provider-name: terraform-provider-kafka
pulumi-infer-version: true
remove-plugins: true
pr-reviewers: iwahbe # Team: pulumi/Providers
javaVersion: "v0.9.5"
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
VERSION := $(shell pulumictl get version)
JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := v0.9.5
TESTPARALLELISM := 10
WORKING_DIR := $(shell pwd)
PULUMI_CONVERT := 0
Expand Down Expand Up @@ -132,8 +131,8 @@ upstream.finalize:
upstream.rebase:
scripts/upstream.sh "$@" start_rebase

bin/pulumi-java-gen:
pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java
bin/pulumi-java-gen: .pulumi-java-gen.version
pulumictl download-binary -n pulumi-language-java -v v$(shell cat .pulumi-java-gen.version) -r pulumi/pulumi-java

# To make an immediately observable change to .ci-mgmt.yaml:
#
Expand All @@ -149,7 +148,8 @@ ci-mgmt: .ci-mgmt.yaml
--config $<

.pulumi/bin/pulumi: .pulumi/version
curl -fsSL https://get.pulumi.com | HOME=$(WORKING_DIR) sh -s -- --version $(cat .pulumi/version)
curl -fsSL https://get.pulumi.com | HOME=$(WORKING_DIR) sh -s -- --version $(shell cat .pulumi/version)
| HOME=$(WORKING_DIR) sh -s -- --version $(cat .pulumi/version)

# Compute the version of Pulumi to use by inspecting the Go dependencies of the provider.
.pulumi/version:
Expand Down

0 comments on commit d26ea07

Please sign in to comment.