Skip to content

Commit

Permalink
Avoid realpath Makefile func that seems flaky on Win (#9943)
Browse files Browse the repository at this point in the history
* Avoid realpath Makefile func that seems flaky on Win

* Correct relpath for top-level Make
  • Loading branch information
t0yv0 authored Jun 23, 2022
1 parent 49b1835 commit 0e64874
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT_NAME := Pulumi SDK
PROJECT_ROOT := $(realpath .)
PROJECT_ROOT := ..
SDKS := dotnet nodejs python go
SUB_PROJECTS := $(SDKS:%=sdk/%)

Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PROJECT_NAME := Pulumi .NET Core SDK
LANGHOST_PKG := github.com/pulumi/pulumi/sdk/v3/dotnet/cmd/pulumi-language-dotnet

PROJECT_PKGS := $(shell go list ./cmd...)
PROJECT_ROOT := $(realpath ../..)
PROJECT_ROOT := ../..

DOTNET_VERSION := $(if ${PULUMI_VERSION},${PULUMI_VERSION},$(shell cd ../../ && pulumictl get version --language dotnet))

Expand Down
2 changes: 1 addition & 1 deletion sdk/go/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ VERSION := $(if ${PULUMI_VERSION},${PULUMI_VERSION},$(shell cd ../../ &
TEST_FAST_PKGS := $(shell go list ./pulumi/... ./pulumi-language-go/... ./common/... | grep -v /vendor/ | grep -v templates)
TEST_AUTO_PKGS := $(shell go list ./auto/... | grep -v /vendor/ | grep -v templates)
TESTPARALLELISM ?= 10
PROJECT_ROOT := $(realpath ../..)
PROJECT_ROOT := ../..

include ../../build/common.mk

Expand Down
2 changes: 1 addition & 1 deletion sdk/nodejs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NODE_MODULE_NAME := @pulumi/pulumi
VERSION := $(if ${PULUMI_VERSION},${PULUMI_VERSION},$(shell cd ../../ && pulumictl get version --language javascript))

LANGUAGE_HOST := github.com/pulumi/pulumi/sdk/v3/nodejs/cmd/pulumi-language-nodejs
PROJECT_ROOT := $(realpath ../..)
PROJECT_ROOT := ../..

PROJECT_PKGS := $(shell go list ./cmd...)
TESTPARALLELISM ?= 10
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PROJECT_NAME := Pulumi Python SDK
LANGHOST_PKG := github.com/pulumi/pulumi/sdk/v3/python/cmd/pulumi-language-python
VERSION := $(if ${PULUMI_VERSION},${PULUMI_VERSION},$(shell cd ../../ && pulumictl get version))
PYPI_VERSION := $(if ${PULUMI_VERSION},${PULUMI_VERSION},$(shell cd ../../ && pulumictl get version --language python))
PROJECT_ROOT := $(realpath ../..)
PROJECT_ROOT := ../..

PYENV := ./env
PYENVSRC := $(PYENV)/src
Expand Down

0 comments on commit 0e64874

Please sign in to comment.