From 45e6204f75b4c04c219eeac85fa88a4bb958eea0 Mon Sep 17 00:00:00 2001 From: Guinevere Saenger Date: Tue, 12 Dec 2023 14:25:58 -0800 Subject: [PATCH] Update Java Gen to use new Java Version file (#1509) Part of https://github.com/pulumi/ci-mgmt/issues/506 --- .ci-mgmt.yaml | 1 - .pulumi-java-gen.version | 1 + .upgrade-config.yml | 1 - Makefile | 5 ++--- 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 .pulumi-java-gen.version diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index 14cc89e4ed..6f75ba9526 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -26,7 +26,6 @@ plugins: version: "0.0.1" team: ecosystem goBuildParallelism: 2 -javaGenVersion: "v0.9.8" runner: prerequisites: pulumi-ubuntu-8core buildSdk: pulumi-ubuntu-8core diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version new file mode 100644 index 0000000000..b5d0ec558f --- /dev/null +++ b/.pulumi-java-gen.version @@ -0,0 +1 @@ +0.9.8 \ No newline at end of file diff --git a/.upgrade-config.yml b/.upgrade-config.yml index 0c1a386cca..53d948e676 100644 --- a/.upgrade-config.yml +++ b/.upgrade-config.yml @@ -5,4 +5,3 @@ upstream-provider-name: terraform-provider-azurerm pulumi-infer-version: true remove-plugins: true pr-reviewers: iwahbe # Team: pulumi/Providers -javaVersion: "v0.9.8" diff --git a/Makefile b/Makefile index 2c77616c51..c8dc005a6d 100644 --- a/Makefile +++ b/Makefile @@ -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.8 TESTPARALLELISM := 10 WORKING_DIR := $(shell pwd) PULUMI_PROVIDER_BUILD_PARALLELISM ?= -p 2 @@ -137,8 +136,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: #