From 773b02bfdd80c0a7ce0bc9479a3784d4f6cb0fac Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 1 Mar 2024 23:21:45 -0800 Subject: [PATCH] [internal] Update GitHub Actions workflow files (#129) --- .github/workflows/release.yml | 2 +- .github/workflows/upgrade-bridge.yml | 11 +++++++++-- .github/workflows/upgrade-provider.yml | 2 +- Makefile | 17 ++++++++++++++++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2a5a4b..ad22a4f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -225,7 +225,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Free Disk Space (Ubuntu) - uses: jlumbroso/free-disk-spacev@v1 + uses: jlumbroso/free-disk-space@v1.3.1 with: # this might remove tools that are actually needed, # if set to "true" but frees about 6 GB diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml index 2bef8e9..82cf073 100644 --- a/.github/workflows/upgrade-bridge.yml +++ b/.github/workflows/upgrade-bridge.yml @@ -38,6 +38,11 @@ on: required: false type: string default: "" + pr-title-prefix: + description: Prefix to add to the auto-opened pull request title + required: false + type: string + default: "" automerge: description: Mark created PR for auto-merging? required: false @@ -53,7 +58,7 @@ jobs: steps: - name: Call upgrade provider action if: github.event_name == 'workflow_dispatch' - uses: pulumi/pulumi-upgrade-provider-action@v0.0.11 + uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 with: kind: ${{ inputs.kind }} email: bot@pulumi.com @@ -63,9 +68,10 @@ jobs: target-pulumi-version: ${{ inputs.target-pulumi-version }} pr-reviewers: ${{ inputs.pr-reviewers }} pr-description: ${{ inputs.pr-description }} + pr-title-prefix: ${{ inputs.pr-title-prefix }} - name: Call upgrade provider action if: github.event_name == 'repository_dispatch' - uses: pulumi/pulumi-upgrade-provider-action@v0.0.11 + uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 with: kind: ${{ github.event.client_payload.kind || 'bridge' }} email: bot@pulumi.com @@ -75,6 +81,7 @@ jobs: target-bridge-version: ${{ github.event.client_payload.target-bridge-version }} pr-reviewers: ${{ github.event.client_payload.pr-reviewers }} pr-description: ${{ github.event.client_payload.pr-description }} + pr-title-prefix: ${{ github.event.client_payload.pr-title-prefix }} - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#7CFC00" diff --git a/.github/workflows/upgrade-provider.yml b/.github/workflows/upgrade-provider.yml index 505e203..04f7d6a 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.11 + uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 with: kind: all email: bot@pulumi.com diff --git a/Makefile b/Makefile index 493c4f0..6991d66 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,8 @@ 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: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +build_dotnet: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) build_dotnet: upstream pulumictl get version --language dotnet PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) dotnet --out sdk/dotnet/ @@ -38,11 +40,15 @@ build_dotnet: upstream echo "$(DOTNET_VERSION)" >version.txt && \ dotnet build /p:Version=$(DOTNET_VERSION) +build_go: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +build_go: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) build_go: upstream PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) go --out sdk/go/ cd sdk && go list "$$(grep -e "^module" go.mod | cut -d ' ' -f 2)/go/..." | xargs -I {} bash -c 'go build {} && go clean -i {}' build_java: PACKAGE_VERSION := $(shell pulumictl get version --language generic) +build_java: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +build_java: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) 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/ && \ @@ -50,6 +56,8 @@ build_java: bin/pulumi-java-gen upstream gradle --console=plain build build_nodejs: VERSION := $(shell pulumictl get version --language javascript) +build_nodejs: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +build_nodejs: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) build_nodejs: upstream PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) nodejs --out sdk/nodejs/ cd sdk/nodejs/ && \ @@ -60,6 +68,8 @@ build_nodejs: upstream sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" ./bin/package.json build_python: PYPI_VERSION := $(shell pulumictl get version --language python) +build_python: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +build_python: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) build_python: upstream rm -rf sdk/python/ PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) python --out sdk/python/ @@ -93,6 +103,8 @@ install_dotnet_sdk: install_nodejs_sdk: yarn link --cwd $(WORKING_DIR)/sdk/nodejs/bin +install_plugins: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +install_plugins: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) install_plugins: .pulumi/bin/pulumi lint_provider: provider @@ -111,6 +123,7 @@ provider_no_deps: provider: tfgen provider_no_deps +test: export PATH := $(WORKING_DIR)/bin:$(PATH) test: cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h @@ -120,9 +133,11 @@ test_provider: @echo "" cd provider && go test -v -short ./... -parallel $(TESTPARALLELISM) +tfgen: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +tfgen: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) 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) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER) + PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER) (cd provider && VERSION=$(VERSION) go generate cmd/$(PROVIDER)/main.go) upstream: