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

Publish after building in CI (before testing)

Browse source
This commit is contained in:
Matt Ellis 2017-12-03 18:12:20 -08:00
parent 07aea959b1
commit b4e3aa52a7
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -43,6 +43,6 @@ coverage:
# The travis_* targets are entrypoints for CI.
.PHONY: travis_cron travis_push travis_pull_request travis_api
travis_cron: all coverage
travis_push: all publish
travis_push: only_build publish only_test
travis_pull_request: all
travis_api: all

2
build.proj
View file

@ -152,7 +152,7 @@
</Target>
<Target Name="AppVeyorPush"
DependsOnTargets="Build;IntegrationTest;Publish" />
DependsOnTargets="Build;Publish;IntegrationTest" />
<Target Name="AppVeyorPullRequest"
DependsOnTargets="Build;IntegrationTest" />

26
build/common.mk
View file

@ -12,14 +12,14 @@
# go code, this usually means running go install (which
# would place them in `GOBIN`, but not `PULUMI_ROOT`
#
# - lint: runs relevent linters for the project
#
# - install: copies the bits we plan to ship into a layout in
# `PULUMI_ROOT` that looks like what a customer would get
# when they download and install Pulumi. For JavaScript
# projects, installing also runs yarn link to register
# this package, so that other projects can depend on it.
#
# - lint: runs relevent linters for the project
#
# - test_fast: runs the fast tests for a project. These are often
# go unit tests or javascript unit tests, they should
# complete quickly, as we expect developers to run them
@ -34,6 +34,11 @@
# In addition, we have a few higher level targets that just depend on
# these targets:
#
# - only_build: this target runs build and install targets
#
# - only_test: this target runs the list and test_all targets
# (test_all itself runs test_fast)
#
# - default: this is the target that is run by default when no
# arguments are passed to make, it runs the build, lint,
# install and test_fast targets
@ -99,11 +104,13 @@ endif
PULUMI_BIN := $(PULUMI_ROOT)/bin
PULUMI_NODE_MODULES := $(PULUMI_ROOT)/node_modules
.PHONY: default all ensure build lint install test_fast test_all core
.PHONY: default all ensure only_build only_test build lint install test_fast test_all core
# If there are sub projects, our default, all, and ensure targets will
# recurse into them.
ifneq ($(SUB_PROJECTS),)
only_build:: $(SUB_PROJECTS:%=%_only_build)
only_test:: $(SUB_PROJECTS:%=%_only_test)
default:: $(SUB_PROJECTS:%=%_default)
all:: $(SUB_PROJECTS:%=%_all)
ensure:: $(SUB_PROJECTS:%=%_ensure)
@ -125,8 +132,8 @@ all::
@echo -e "\033[1;37m$(shell echo '$(PROJECT_NAME)' | sed -e 's/./=/g')\033[1;37m"
endif
default:: build lint install test_fast
all:: build lint install test_all
default:: build install lint test_fast
all:: build install lint test_all
ensure::
$(call STEP_MESSAGE)
@ -164,6 +171,9 @@ install::
yarn link
endif
only_build:: build install
only_test:: lint test_all
# Generate targets for each sub project. This project's default and
# all targets will depend on the sub project's targets, and the
# individual targets for sub projects are added as a convience when
@ -183,8 +193,10 @@ $(SUB_PROJECTS:%=%_test_fast):
@$(MAKE) -C ./$(@:%_test_fast=%) test_fast
$(SUB_PROJECTS:%=%_install):
@$(MAKE) -C ./$(@:%_install=%) install
$(SUB_PROJECTS:%=%_test_all):
@$(MAKE) -C ./$(@:%_test_all=%) test_all
$(SUB_PROJECTS:%=%_only_build):
@$(MAKE) -C ./$(@:%_only_build=%) only_build
$(SUB_PROJECTS:%=%_only_test):
@$(MAKE) -C ./$(@:%_only_test=%) only_test
endif
# As a convinece, we provide a format target that folks can build to