Skip to content

Commit

Permalink
Point to the new Pulumi packages (pulumi#629)
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 committed Apr 6, 2020
1 parent 158c225 commit b37e356
Show file tree
Hide file tree
Showing 4 changed files with 411 additions and 178 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ install:
yarn global add tslint typescript

ensure:
cd misc/test && GO111MODULE=on go mod vendor
cd misc/test && GO111MODULE=on go mod tidy
cd misc/test && GO111MODULE=on go mod download

only_build:

lint:
tslint -c tslint.json **/*.ts

only_test:
go test ./misc/test/... --timeout 4h -v -count=1 -short -parallel 40
cd misc/test && go test ./... --timeout 4h -v -count=1 -short -parallel 40

# The travis_* targets are entrypoints for CI.
.PHONY: travis_cron travis_push travis_pull_request travis_api
Expand Down
2 changes: 1 addition & 1 deletion misc/test/examples_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/pulumi/pulumi/pkg/resource"
"github.com/pulumi/pulumi/sdk/go/common/resource"
"github.com/pulumi/pulumi/pkg/testing/integration"
"github.com/stretchr/testify/assert"
)
Expand Down
19 changes: 4 additions & 15 deletions misc/test/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,10 @@ module github.com/pulumi/examples
go 1.13

require (
github.com/Azure/azure-amqp-common-go v1.1.4 // indirect
github.com/apache/thrift v0.12.0 // indirect
github.com/aws/aws-sdk-go v1.19.45
github.com/openzipkin/zipkin-go v0.1.6 // indirect
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 // indirect
github.com/pulumi/pulumi v1.6.1-0.20191120205257-a600d1652666
github.com/reconquest/loreley v0.0.0-20160708080500-2ab6b7470a54 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
github.com/stretchr/testify v1.4.0
github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 // indirect
github.com/uber-go/atomic v1.3.2 // indirect
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
github.com/xdg/stringprep v1.0.0 // indirect
go.mongodb.org/mongo-driver v1.0.1 // indirect
go.uber.org/atomic v1.3.2 // indirect
github.com/aws/aws-sdk-go v1.29.27
github.com/pulumi/pulumi/pkg v1.14.0
github.com/pulumi/pulumi/sdk v1.14.0
github.com/stretchr/testify v1.5.1
)

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
Loading

0 comments on commit b37e356

Please sign in to comment.