maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update builds to handle new go mod layout

Browse source
This commit is contained in:
evanboyle 2020-03-18 16:41:23 -07:00
parent 5f3af2d71d
commit d65c65122f
5 changed files with 78 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
.appveyor.yml
View file

@ -62,9 +62,45 @@ build_script:
- cmd: >-
set GO111MODULE=on
pushd .
cd sdk
go mod tidy
go mod vendor
popd
pushd .
cd pkg
go mod tidy
go mod vendor
popd
pushd .
cd examples
go mod tidy
go mod vendor
popd
pushd .
cd tests
go mod tidy
go mod vendor
popd
if defined APPVEYOR_REPO_TAG_NAME ( dotnet msbuild /t:ReleaseProcess /v:Detailed build.proj )
test: off

18
.github/workflows/windows-build.yml vendored
View file

@ -64,8 +64,26 @@ jobs:
run: |
cd src\github.com\${{ github.repository }}
set GOMODULE111=on
pushd .
cd sdk
go mod tidy
go mod vendor
popd
pushd .
cd pkg
go mod tidy
go mod vendor
popd
pushd .
cd examples
go mod tidy
go mod vendor
popd
pushd .
cd tests
go mod tidy
go mod vendor
popd
- name: Build Pulumi
run: |
cd src\github.com\${{ github.repository }}

2
.gitignore vendored
View file

@ -1,5 +1,5 @@
*.swp
/vendor/
**/vendor/
**/node_modules/
**/bin
**/.vscode/

23
Makefile
View file

@ -9,6 +9,29 @@ VERSION := $(shell scripts/get-version HEAD)
TESTPARALLELISM := 10
ensure::
$(call STEP_MESSAGE)
ifeq ($(NOPROXY), true)
@echo "cd sdk && GO111MODULE=on go mod tidy"; cd sdk && GO111MODULE=on go mod tidy
@echo "cd sdk && GO111MODULE=on go mod vendor"; cd sdk && GO111MODULE=on go mod vendor
@echo "cd pkg && GO111MODULE=on go mod tidy"; cd pkg && GO111MODULE=on go mod tidy
@echo "cd pkg && GO111MODULE=on go mod vendor"; cd pkg && GO111MODULE=on go mod vendor
@echo "cd examples && GO111MODULE=on go mod tidy"; cd examples && GO111MODULE=on go mod tidy
@echo "cd examples && GO111MODULE=on go mod vendor"; cd examples && GO111MODULE=on go mod vendor
@echo "cd tests && GO111MODULE=on go mod tidy"; cd tests && GO111MODULE=on go mod tidy
@echo "cd tests && GO111MODULE=on go mod vendor"; cd tests && GO111MODULE=on go mod vendor
else
@echo "cd sdk && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd sdk && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
@echo "cd sdk && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor"; cd sdk && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor
@echo "cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
@echo "cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor"; cd pkg && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor
@echo "cd examples && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd examples && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
@echo "cd examples && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor"; cd examples && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor
@echo "cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
@echo "cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor"; cd tests && GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor
endif
build-proto::
cd sdk/proto && ./generate.sh

8
build/common.mk
View file

@ -152,14 +152,6 @@ all:: build install lint test_all
ensure::
$(call STEP_MESSAGE)
ifeq ($(NOPROXY), true)
@echo "GO111MODULE=on go mod tidy"; GO111MODULE=on go mod tidy
@echo "GO111MODULE=on go mod vendor"; GO111MODULE=on go mod vendor
else
@echo "GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy"; GO111MODULE=on GOPROXY=$(GOPROXY) go mod tidy
@echo "GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor"; GO111MODULE=on GOPROXY=$(GOPROXY) go mod vendor
endif
@if [ -e 'package.json' ]; then echo "yarn install"; yarn install; fi
build::
$(call STEP_MESSAGE)