Skip to content
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.

Sign up for GitHub

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

Do not pollute workdir during pulumictl auto-installation #1335

Closed
wants to merge 3 commits into from
Closed

Do not pollute workdir during pulumictl auto-installation #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09bfc40
Do not overrride GOPATH when auto-installing pulumictl
t0yv0 Jan 31, 2025
6020bd4
Upgrade pulumictl to v0.0.48
t0yv0 Jan 31, 2025
6de64b3
make
t0yv0 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion provider-ci/internal/pkg/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package pkg

const (
defaultPulumiCTLVersion = "v0.0.46"
defaultPulumiCTLVersion = "v0.0.48"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 0.0.46 version had replaces in go.mod that caused go install to complain. The latest version has no such problem.

)
6 changes: 4 additions & 2 deletions provider-ci/internal/pkg/templates/bridged-provider/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ PULUMI_MISSING_DOCS_ERROR := true
PULUMICTL_VERSION := #{{ .Config.ToolVersions.PulumiCTL }}#
PULUMICTL := $(shell which pulumictl || \
(test ! -e $(WORKING_DIR)/bin/pulumictl && \
GOPATH="$(WORKING_DIR)" go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)"; \
echo "$(WORKING_DIR)/bin/pulumictl"))
go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)" && \
mkdir -p "$(WORKING_DIR)/bin" && \
cp "$(shell go env GOPATH)/bin/pulumictl" "$(WORKING_DIR)/bin/pulumictl"; \
echo "$(WORKING_DIR)/bin/pulumictl"))

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
Expand Down
2 changes: 1 addition & 1 deletion provider-ci/test-providers/acme/.github/actions/setup-tools/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ runs:
if: inputs.tools == 'all' || contains(inputs.tools, 'pulumictl')
uses: jaxxstorm/action-install-gh-release@cd6b2b78ad38bdd294341cda064ec0692b06215b # v1.14.0
with:
tag: v0.0.46
tag: v0.0.48
repo: pulumi/pulumictl

- name: Install Pulumi CLI
Expand Down
8 changes: 5 additions & 3 deletions provider-ci/test-providers/acme/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ PULUMI_PROVIDER_BUILD_PARALLELISM ?=
PULUMI_CONVERT := 0
PULUMI_MISSING_DOCS_ERROR := true

PULUMICTL_VERSION := v0.0.46
PULUMICTL_VERSION := v0.0.48
PULUMICTL := $(shell which pulumictl || \
(test ! -e $(WORKING_DIR)/bin/pulumictl && \
GOPATH="$(WORKING_DIR)" go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)"; \
echo "$(WORKING_DIR)/bin/pulumictl"))
go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)" && \
mkdir -p "$(WORKING_DIR)/bin" && \
cp "$(shell go env GOPATH)/bin/pulumictl" "$(WORKING_DIR)/bin/pulumictl"; \
echo "$(WORKING_DIR)/bin/pulumictl"))

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
Expand Down
2 changes: 1 addition & 1 deletion provider-ci/test-providers/aws/.github/actions/setup-tools/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ runs:
if: inputs.tools == 'all' || contains(inputs.tools, 'pulumictl')
uses: jaxxstorm/action-install-gh-release@cd6b2b78ad38bdd294341cda064ec0692b06215b # v1.14.0
with:
tag: v0.0.46
tag: v0.0.48
repo: pulumi/pulumictl

- name: Install Pulumi CLI
Expand Down
8 changes: 5 additions & 3 deletions provider-ci/test-providers/aws/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ PULUMI_PROVIDER_BUILD_PARALLELISM ?= -p 2
PULUMI_CONVERT := 1
PULUMI_MISSING_DOCS_ERROR := true

PULUMICTL_VERSION := v0.0.46
PULUMICTL_VERSION := v0.0.48
PULUMICTL := $(shell which pulumictl || \
(test ! -e $(WORKING_DIR)/bin/pulumictl && \
GOPATH="$(WORKING_DIR)" go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)"; \
echo "$(WORKING_DIR)/bin/pulumictl"))
go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)" && \
mkdir -p "$(WORKING_DIR)/bin" && \
cp "$(shell go env GOPATH)/bin/pulumictl" "$(WORKING_DIR)/bin/pulumictl"; \
echo "$(WORKING_DIR)/bin/pulumictl"))

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
Expand Down
2 changes: 1 addition & 1 deletion provider-ci/test-providers/cloudflare/.github/actions/setup-tools/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ runs:
if: inputs.tools == 'all' || contains(inputs.tools, 'pulumictl')
uses: jaxxstorm/action-install-gh-release@cd6b2b78ad38bdd294341cda064ec0692b06215b # v1.14.0
with:
tag: v0.0.46
tag: v0.0.48
repo: pulumi/pulumictl

- name: Install Pulumi CLI
Expand Down
8 changes: 5 additions & 3 deletions provider-ci/test-providers/cloudflare/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ PULUMI_PROVIDER_BUILD_PARALLELISM ?=
PULUMI_CONVERT := 1
PULUMI_MISSING_DOCS_ERROR := true

PULUMICTL_VERSION := v0.0.46
PULUMICTL_VERSION := v0.0.48
PULUMICTL := $(shell which pulumictl || \
(test ! -e $(WORKING_DIR)/bin/pulumictl && \
GOPATH="$(WORKING_DIR)" go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)"; \
echo "$(WORKING_DIR)/bin/pulumictl"))
go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)" && \
mkdir -p "$(WORKING_DIR)/bin" && \
cp "$(shell go env GOPATH)/bin/pulumictl" "$(WORKING_DIR)/bin/pulumictl"; \
echo "$(WORKING_DIR)/bin/pulumictl"))

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
Expand Down
2 changes: 1 addition & 1 deletion provider-ci/test-providers/docker/.github/actions/setup-tools/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ runs:
if: inputs.tools == 'all' || contains(inputs.tools, 'pulumictl')
uses: jaxxstorm/action-install-gh-release@cd6b2b78ad38bdd294341cda064ec0692b06215b # v1.14.0
with:
tag: v0.0.46
tag: v0.0.48
repo: pulumi/pulumictl

- name: Install Pulumi CLI
Expand Down
8 changes: 5 additions & 3 deletions provider-ci/test-providers/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ PULUMI_PROVIDER_BUILD_PARALLELISM ?=
PULUMI_CONVERT := 1
PULUMI_MISSING_DOCS_ERROR := true

PULUMICTL_VERSION := v0.0.46
PULUMICTL_VERSION := v0.0.48
PULUMICTL := $(shell which pulumictl || \
(test ! -e $(WORKING_DIR)/bin/pulumictl && \
GOPATH="$(WORKING_DIR)" go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)"; \
echo "$(WORKING_DIR)/bin/pulumictl"))
go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)" && \
mkdir -p "$(WORKING_DIR)/bin" && \
cp "$(shell go env GOPATH)/bin/pulumictl" "$(WORKING_DIR)/bin/pulumictl"; \
echo "$(WORKING_DIR)/bin/pulumictl"))

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
Expand Down
2 changes: 1 addition & 1 deletion provider-ci/test-providers/eks/.github/actions/setup-tools/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ runs:
if: inputs.tools == 'all' || contains(inputs.tools, 'pulumictl')
uses: jaxxstorm/action-install-gh-release@cd6b2b78ad38bdd294341cda064ec0692b06215b # v1.14.0
with:
tag: v0.0.46
tag: v0.0.48
repo: pulumi/pulumictl

- name: Install Pulumi CLI
Expand Down
8 changes: 5 additions & 3 deletions provider-ci/test-providers/eks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ PULUMI_PROVIDER_BUILD_PARALLELISM ?=
PULUMI_CONVERT := 0
PULUMI_MISSING_DOCS_ERROR := true

PULUMICTL_VERSION := v0.0.46
PULUMICTL_VERSION := v0.0.48
PULUMICTL := $(shell which pulumictl || \
(test ! -e $(WORKING_DIR)/bin/pulumictl && \
GOPATH="$(WORKING_DIR)" go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)"; \
echo "$(WORKING_DIR)/bin/pulumictl"))
go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)" && \
mkdir -p "$(WORKING_DIR)/bin" && \
cp "$(shell go env GOPATH)/bin/pulumictl" "$(WORKING_DIR)/bin/pulumictl"; \
echo "$(WORKING_DIR)/bin/pulumictl"))

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
Expand Down
Loading