Skip to content

Commit 65cfd2e

Browse files
Remove pulumictl and java-gen
- We only use the `pulumi` CLI for generation now. - Remove upgrade targets too.
1 parent c2b77c7 commit 65cfd2e

File tree

3 files changed

+3
-27
lines changed

3 files changed

+3
-27
lines changed

.pulumi-java-gen.version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.pulumictl.version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Makefile

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ifeq (,$(SPECS))
1414
$(error Specs missing! Checkout submodules before building: git submodule update --init --recursive)
1515
endif
1616

17-
JAVA_GEN := pulumi-java-gen
18-
1917
GOOS ?= $(shell go env GOOS)
2018
GOARCH ?= $(shell go env GOARCH)
2119
GOEXE ?= $(shell go env GOEXE)
@@ -49,7 +47,7 @@ _ := $(shell mkdir -p .make)
4947

5048
.PHONY: default ensure dist
5149
default: provider build_sdks
52-
ensure: bin/pulumictl .make/provider_mod_download
50+
ensure: .make/provider_mod_download
5351
dist: dist/pulumi-azure-native_$(PROVIDER_VERSION)_checksums.txt dist/docs-schema.json
5452

5553
# Binaries
@@ -175,14 +173,10 @@ schema_squeeze: bin/$(CODEGEN)
175173
.PHONY: explode_schema
176174
explode_schema: dist/docs-schema.json
177175

178-
.PHONY: upgrade_tools upgrade_java upgrade_pulumi upgrade_pulumictl upgrade_schematools
179-
upgrade_tools: upgrade_java upgrade_pulumi upgrade_pulumictl upgrade_schematools
180-
upgrade_java:
181-
gh release list --repo pulumi/pulumi-java --exclude-drafts --exclude-pre-releases --limit 1 | cut -f1 > .pulumi-java-gen.version
176+
.PHONY: upgrade_tools upgrade_pulumi upgrade_schematools
177+
upgrade_tools: upgrade_pulumi upgrade_schematools
182178
upgrade_pulumi:
183179
gh release list --repo pulumi/pulumi --exclude-drafts --exclude-pre-releases --limit 1 | cut -f1 | sed 's/^v//' > .pulumi.version
184-
upgrade_pulumictl:
185-
gh release list --repo pulumi/pulumictl --exclude-drafts --exclude-pre-releases --limit 1 | cut -f1 | sed 's/^v//' > .pulumictl.version
186180
upgrade_schematools:
187181
gh release list --repo pulumi/schema-tools --exclude-drafts --exclude-pre-releases --limit 1 | cut -f1 | sed 's/^v//' > .schema-tools.version
188182

@@ -193,22 +187,6 @@ upgrade_schematools:
193187
.pulumi/bin/pulumi: .pulumi.version
194188
curl -fsSL https://get.pulumi.com | sh -s -- --version "$(PULUMI_VERSION)"
195189

196-
# Download local copy of pulumictl based on the version in .pulumictl.version
197-
# Anywhere which uses VERSION_GENERIC or VERSION_FLAGS should depend on bin/pulumictl
198-
bin/pulumictl: PULUMICTL_VERSION := $(shell cat .pulumictl.version)
199-
bin/pulumictl: PLAT := $(shell go version | sed -En "s/go version go.* (.*)\/(.*)/\1-\2/p")
200-
bin/pulumictl: PULUMICTL_URL := "https://github.com/pulumi/pulumictl/releases/download/v$(PULUMICTL_VERSION)/pulumictl-v$(PULUMICTL_VERSION)-$(PLAT).tar.gz"
201-
bin/pulumictl: .pulumictl.version
202-
@echo "Installing pulumictl"
203-
@mkdir -p bin
204-
wget -q -O - "$(PULUMICTL_URL)" | tar -xzf - -C $(WORKING_DIR)/bin pulumictl
205-
@touch bin/pulumictl
206-
@echo "pulumictl" $$(./bin/pulumictl version)
207-
208-
bin/pulumi-java-gen: .pulumi-java-gen.version bin/pulumictl
209-
@mkdir -p bin
210-
bin/pulumictl download-binary -n pulumi-language-java -v $(shell cat .pulumi-java-gen.version) -r pulumi/pulumi-java
211-
212190
dist/docs-schema.json: bin/schema-full.json
213191
rm -rf bin/schema
214192
mkdir -p bin/schema

0 commit comments

Comments
 (0)