-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update to Plugin Framework #190
Changes from 20 commits
53be0a2
773c920
34efdf7
2c31ba6
e66f209
ff5219f
5ac03ac
9bccea2
38d707e
e809ec3
ea73809
d76a577
2f8ae24
514c387
77a9104
9cf2d44
7913aad
d1db013
2a121e8
7e9a59d
705b586
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,24 @@ | ||
# NOTE: temporary hand edited to add --version-prefix. | ||
|
||
# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt | ||
|
||
PACK := tls | ||
ORG := pulumi | ||
PROJECT := github.com/$(ORG)/pulumi-$(PACK) | ||
PROVIDER_PATH := provider/v4 | ||
PROVIDER_PATH := provider/v5 | ||
VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version | ||
TFGEN := pulumi-tfgen-$(PACK) | ||
PROVIDER := pulumi-resource-$(PACK) | ||
VERSION := $(shell pulumictl get version) | ||
VERSION := $(shell pulumictl get version --version-prefix 5.0.0) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If I run this locally, I get the correct behavior without this change. $ git tag v5.0.0
$ pulumictl get version --language generic
5.0.0 That should cover releases produced via tags. I tried this with a few different tags as well. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes to get this behavior in CI you need to publish the tag, which might trigger a release :) And if CI-local fidelity is lost then some tests break. |
||
JAVA_GEN := pulumi-java-gen | ||
JAVA_GEN_VERSION := v0.5.4 | ||
TESTPARALLELISM := 10 | ||
WORKING_DIR := $(shell pwd) | ||
|
||
ver:: | ||
echo "${VERSION_PREFIX}" | ||
echo "${VERSION}" | ||
|
||
development: install_plugins provider build_sdks install_sdks | ||
|
||
build: install_plugins provider build_sdks install_sdks | ||
|
@@ -29,9 +35,9 @@ install_sdks: install_dotnet_sdk install_python_sdk install_nodejs_sdk install_j | |
|
||
only_build: build | ||
|
||
build_dotnet: DOTNET_VERSION := $(shell pulumictl get version --language dotnet) | ||
build_dotnet: DOTNET_VERSION := $(shell pulumictl get version --language dotnet --version-prefix 5.0.0) | ||
build_dotnet: upstream | ||
pulumictl get version --language dotnet | ||
pulumictl get version --language dotnet --version-prefix 5.0.0 | ||
$(WORKING_DIR)/bin/$(TFGEN) dotnet --out sdk/dotnet/ | ||
cd sdk/dotnet/ && \ | ||
echo "module fake_dotnet_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \ | ||
|
@@ -42,14 +48,14 @@ build_go: upstream | |
$(WORKING_DIR)/bin/$(TFGEN) go --out sdk/go/ | ||
cd sdk && go list `grep -e "^module" go.mod | cut -d ' ' -f 2`/go/... | xargs go build | ||
|
||
build_java: PACKAGE_VERSION := $(shell pulumictl get version --language generic) | ||
build_java: PACKAGE_VERSION := $(shell pulumictl get version --language generic --version-prefix 5.0.0) | ||
build_java: bin/pulumi-java-gen upstream | ||
$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java --build gradle-nexus | ||
cd sdk/java/ && \ | ||
echo "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \ | ||
gradle --console=plain build | ||
|
||
build_nodejs: VERSION := $(shell pulumictl get version --language javascript) | ||
build_nodejs: VERSION := $(shell pulumictl get version --language javascript --version-prefix 5.0.0) | ||
build_nodejs: upstream | ||
$(WORKING_DIR)/bin/$(TFGEN) nodejs --out sdk/nodejs/ | ||
cd sdk/nodejs/ && \ | ||
|
@@ -59,7 +65,7 @@ build_nodejs: upstream | |
cp ../../README.md ../../LICENSE* package.json yarn.lock ./bin/ && \ | ||
sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" ./bin/package.json | ||
|
||
build_python: PYPI_VERSION := $(shell pulumictl get version --language python) | ||
build_python: PYPI_VERSION := $(shell pulumictl get version --language python --version-prefix 5.0.0) | ||
build_python: upstream | ||
$(WORKING_DIR)/bin/$(TFGEN) python --out sdk/python/ | ||
cd sdk/python/ && \ | ||
|
@@ -158,4 +164,4 @@ endif | |
bin/pulumi-java-gen: | ||
$(shell pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java) | ||
|
||
.PHONY: development build build_sdks install_go_sdk install_java_sdk install_python_sdk install_sdks only_build build_dotnet build_go build_java build_nodejs build_python clean cleanup finish-patch help install_dotnet_sdk install_nodejs_sdk install_plugins lint_provider provider start-patch test tfgen upstream | ||
.PHONY: development build build_sdks install_go_sdk install_java_sdk install_python_sdk install_sdks only_build build_dotnet build_go build_java build_nodejs build_python clean cleanup finish-patch help install_dotnet_sdk install_nodejs_sdk install_plugins lint_provider provider start-patch test tfgen upstream |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calling out this temporary edit. VERSION_PREFIX makes CI generate 5.x.x versions before an actual 5.x.x release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to make the PR to ci-mgmt first to edit major-version here:
https://github.com/pulumi/ci-mgmt/blob/master/provider-ci/providers/tls/config.yaml
And rebase on top of that? Might reduce the size of the diff, maybe obviate some of these changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather follow up with a PR to clean up. I've put the comments in pulumi/ci-mgmt#318 and sounds like we're doing that next iteration - once that's in this dance won't be needed anymore.