From 710e01606d7c56f9dec84241a0665ab245874d46 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 6 Oct 2023 23:09:10 -0700 Subject: [PATCH] Update GitHub Actions workflows. (#226) This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 8765da6eb2161be86f6cbda8a9a19988c3ad1a48. --- .github/workflows/main.yml | 2 ++ .github/workflows/prerelease.yml | 2 ++ .github/workflows/release.yml | 2 ++ .github/workflows/run-acceptance-tests.yml | 2 ++ .github/workflows/upgrade-bridge.yml | 2 +- .github/workflows/upgrade-provider.yml | 2 +- .upgrade-config.yml | 1 + Makefile | 11 ++++++++--- 8 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c25525b4f2..52e013fcb1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -211,6 +211,8 @@ jobs: repo: pulumi/schema-tools - name: Build tfgen & provider binaries run: make provider + - name: Unit-test provider code + run: make test_provider - if: github.event_name == 'pull_request' name: Check Schema is Valid run: | diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index ac6c606b19..1d659c2588 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -158,6 +158,8 @@ jobs: repo: pulumi/schema-tools - name: Build tfgen & provider binaries run: make provider + - name: Unit-test provider code + run: make test_provider - if: github.event_name == 'pull_request' name: Check Schema is Valid run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 957ef88fda..de573772f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -171,6 +171,8 @@ jobs: repo: pulumi/schema-tools - name: Build tfgen & provider binaries run: make provider + - name: Unit-test provider code + run: make test_provider - if: github.event_name == 'pull_request' name: Check Schema is Valid run: | diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 512609b3f8..31c18b95c8 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -182,6 +182,8 @@ jobs: repo: pulumi/schema-tools - name: Build tfgen & provider binaries run: make provider + - name: Unit-test provider code + run: make test_provider - if: github.event_name == 'pull_request' name: Check Schema is Valid run: | diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml index 446131f99c..75cea22e8f 100644 --- a/.github/workflows/upgrade-bridge.yml +++ b/.github/workflows/upgrade-bridge.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Call upgrade provider action - uses: pulumi/pulumi-upgrade-provider-action@v0.0.6 + uses: pulumi/pulumi-upgrade-provider-action@v0.0.7 with: kind: bridge - env: diff --git a/.github/workflows/upgrade-provider.yml b/.github/workflows/upgrade-provider.yml index a820365e90..4e067abcd5 100644 --- a/.github/workflows/upgrade-provider.yml +++ b/.github/workflows/upgrade-provider.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Call upgrade provider action - uses: pulumi/pulumi-upgrade-provider-action@v0.0.6 + uses: pulumi/pulumi-upgrade-provider-action@v0.0.7 with: kind: all - env: diff --git a/.upgrade-config.yml b/.upgrade-config.yml index 941540104b..6dfddcb055 100644 --- a/.upgrade-config.yml +++ b/.upgrade-config.yml @@ -6,3 +6,4 @@ pulumi-infer-version: true remove-plugins: true pr-reviewers: pulumi/Providers,lukehoban +javaVersion: "v0.9.7" diff --git a/Makefile b/Makefile index 606eee5dce..25151c7372 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,12 @@ provider: tfgen install_plugins test: cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h +test_provider: + @echo "" + @echo "== test_provider ===================================================================" + @echo "" + cd provider && go test -v -short ./... -parallel $(TESTPARALLELISM) + tfgen: install_plugins upstream (cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN)) PATH=${PWD}/.pulumi/bin:$$PATH PULUMI_CONVERT=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER) @@ -142,13 +148,12 @@ ci-mgmt: .ci-mgmt.yaml --template bridged-provider \ --config $< -.pulumi/bin/pulumi: HOME := $(WORKING_DIR) .pulumi/bin/pulumi: .pulumi/version - curl -fsSL https://get.pulumi.com | sh -s -- --version $(cat .pulumi/version) + curl -fsSL https://get.pulumi.com | 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: @mkdir -p .pulumi @cd provider && go list -f "{{slice .Version 1}}" -m github.com/pulumi/pulumi/pkg/v3 | tee ../$@ -.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 help install_dotnet_sdk install_nodejs_sdk install_plugins lint_provider provider test tfgen upstream upstream.finalize upstream.rebase ci-mgmt +.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 help install_dotnet_sdk install_nodejs_sdk install_plugins lint_provider provider test tfgen upstream upstream.finalize upstream.rebase ci-mgmt test_provider