Skip to content

Commit f26a05c

Browse files
authored
Update GitHub Actions workflows. (#401)
This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 37dec67d2f95d9d7f35658dc637ce507fdfa43b9.
1 parent 83d0c8e commit f26a05c

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
runs-on: ubuntu-latest
240240
steps:
241241
- name: Free Disk Space (Ubuntu)
242-
uses: jlumbroso/free-disk-spacev@v1
242+
uses: jlumbroso/free-disk-space@v1.3.1
243243
with:
244244
# this might remove tools that are actually needed,
245245
# if set to "true" but frees about 6 GB

.github/workflows/upgrade-bridge.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ on:
3838
required: false
3939
type: string
4040
default: ""
41+
pr-title-prefix:
42+
description: Prefix to add to the auto-opened pull request title
43+
required: false
44+
type: string
45+
default: ""
4146
automerge:
4247
description: Mark created PR for auto-merging?
4348
required: false
@@ -53,7 +58,7 @@ jobs:
5358
steps:
5459
- name: Call upgrade provider action
5560
if: github.event_name == 'workflow_dispatch'
56-
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
61+
uses: pulumi/pulumi-upgrade-provider-action@v0.0.12
5762
with:
5863
kind: ${{ inputs.kind }}
5964
email: bot@pulumi.com
@@ -63,9 +68,10 @@ jobs:
6368
target-pulumi-version: ${{ inputs.target-pulumi-version }}
6469
pr-reviewers: ${{ inputs.pr-reviewers }}
6570
pr-description: ${{ inputs.pr-description }}
71+
pr-title-prefix: ${{ inputs.pr-title-prefix }}
6672
- name: Call upgrade provider action
6773
if: github.event_name == 'repository_dispatch'
68-
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
74+
uses: pulumi/pulumi-upgrade-provider-action@v0.0.12
6975
with:
7076
kind: ${{ github.event.client_payload.kind || 'bridge' }}
7177
email: bot@pulumi.com
@@ -75,6 +81,7 @@ jobs:
7581
target-bridge-version: ${{ github.event.client_payload.target-bridge-version }}
7682
pr-reviewers: ${{ github.event.client_payload.pr-reviewers }}
7783
pr-description: ${{ github.event.client_payload.pr-description }}
84+
pr-title-prefix: ${{ github.event.client_payload.pr-title-prefix }}
7885
- env:
7986
SLACK_CHANNEL: provider-upgrade-publish-status
8087
SLACK_COLOR: "#7CFC00"

.github/workflows/upgrade-provider.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Call upgrade provider action
13-
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
13+
uses: pulumi/pulumi-upgrade-provider-action@v0.0.12
1414
with:
1515
kind: all
1616
email: bot@pulumi.com

Makefile

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ install_sdks: install_dotnet_sdk install_python_sdk install_nodejs_sdk install_j
3030
only_build: build
3131

3232
build_dotnet: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
33+
build_dotnet: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
34+
build_dotnet: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
3335
build_dotnet: upstream
3436
pulumictl get version --language dotnet
3537
PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) dotnet --out sdk/dotnet/
@@ -38,18 +40,24 @@ build_dotnet: upstream
3840
echo "$(DOTNET_VERSION)" >version.txt && \
3941
dotnet build /p:Version=$(DOTNET_VERSION)
4042

43+
build_go: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
44+
build_go: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
4145
build_go: upstream
4246
PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) go --out sdk/go/
4347
cd sdk && go list "$$(grep -e "^module" go.mod | cut -d ' ' -f 2)/go/..." | xargs -I {} bash -c 'go build {} && go clean -i {}'
4448

4549
build_java: PACKAGE_VERSION := $(shell pulumictl get version --language generic)
50+
build_java: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
51+
build_java: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
4652
build_java: bin/pulumi-java-gen upstream
4753
$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java --build gradle-nexus
4854
cd sdk/java/ && \
4955
printf "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \
5056
gradle --console=plain build
5157

5258
build_nodejs: VERSION := $(shell pulumictl get version --language javascript)
59+
build_nodejs: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
60+
build_nodejs: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
5361
build_nodejs: upstream
5462
PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) nodejs --out sdk/nodejs/
5563
cd sdk/nodejs/ && \
@@ -60,6 +68,8 @@ build_nodejs: upstream
6068
sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" ./bin/package.json
6169

6270
build_python: PYPI_VERSION := $(shell pulumictl get version --language python)
71+
build_python: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
72+
build_python: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
6373
build_python: upstream
6474
rm -rf sdk/python/
6575
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:
93103
install_nodejs_sdk:
94104
yarn link --cwd $(WORKING_DIR)/sdk/nodejs/bin
95105

106+
install_plugins: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
107+
install_plugins: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
96108
install_plugins: .pulumi/bin/pulumi
97109

98110
lint_provider: provider
@@ -111,6 +123,7 @@ provider_no_deps:
111123

112124
provider: tfgen provider_no_deps
113125

126+
test: export PATH := $(WORKING_DIR)/bin:$(PATH)
114127
test:
115128
cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h
116129

@@ -120,9 +133,11 @@ test_provider:
120133
@echo ""
121134
cd provider && go test -v -short ./... -parallel $(TESTPARALLELISM)
122135

136+
tfgen: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
137+
tfgen: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
123138
tfgen: install_plugins upstream
124139
(cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN))
125-
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)
140+
PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER)
126141
(cd provider && VERSION=$(VERSION) go generate cmd/$(PROVIDER)/main.go)
127142

128143
upstream:

0 commit comments

Comments
 (0)