Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

Don't yarn link @pulumi dependencies #467

Merged
merged 1 commit into from
May 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ before_install:
# Install Yarn as per https://yarnpkg.com/lang/en/docs/install-ci/#travis-tab.
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.2.1
- export PATH=$HOME/.yarn/bin:$PATH
# Install Pulumi
- ${GOPATH}/src/github.com/pulumi/home/scripts/install-pulumi.sh v0.12.0
- export PATH=/usr/local/pulumi/bin:$PATH
- . ${GOPATH}/src/github.com/pulumi/home/scripts/keep-failed-tests.sh
install:
- ${GOPATH}/src/github.com/pulumi/home/scripts/install-locked.sh ${PULUMI_ROOT} pulumi pulumi-aws
- make ensure
before_script:
# Ensure the working tree is clean (make ensure may have updated lock files)
Expand Down
37 changes: 35 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ required = ["github.com/pulumi/pulumi-aws"]

[[override]]
name = "github.com/pulumi/pulumi"
revision = "97c13440356bbf82bdecf000281f79c48a28117e"

[[override]]
name = "github.com/pulumi/pulumi-aws"
revision = "9067b79c92640640f7a7a80655104a155d55799f"
version = "v0.12.0"

[[constraint]]
name = "github.com/stretchr/testify"
Expand Down
1 change: 0 additions & 1 deletion api/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ VERSION := $(shell ../scripts/get-version)
export PATH := $(shell yarn bin 2>/dev/null):$(PATH)

build::
yarn link @pulumi/pulumi
tsc
sed -e "s/\$${VERSION}/$(VERSION)/g" < package.json > bin/package.json
cp ../README.md ../LICENSE bin/
Expand Down
6 changes: 3 additions & 3 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"homepage": "https://pulumi.io/cloud",
"repository": "https://github.com/pulumi/pulumi-cloud",
"types": "types.d.ts",
"dependencies": {
"@pulumi/pulumi": "^0.12.0"
},
"devDependencies": {
"@types/node": "^8.0.26",
"tslint": "^5.7.0",
"typescript": "^2.6.2"
},
"peerDependencies": {
"@pulumi/pulumi": "^0.11.1-dev-1523390330-g479a2e6a"
}
}
Loading