Skip to content
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
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ branches:
- production
- fusion
before_install:
# Use travisqueue to manage build concurrency.
- ./scripts/travisqueue.sh install
- ./scripts/travisqueue.sh start
# Download and install required tools.
# Install assume-role tool for use when deploying
- go get -u github.com/remind101/assume-role
# AWS CLI
- pip install --upgrade --user awscli
# pulumi
Expand All @@ -26,7 +25,6 @@ before_install:
script:
- echo "TRAVIS_EVENT_TYPE=${TRAVIS_EVENT_TYPE}"
- make travis_${TRAVIS_EVENT_TYPE}
after_script:
- ./scripts/travisqueue.sh finish
notifications:
webhooks: https://ufci1w66n3.execute-api.us-west-2.amazonaws.com/stage/travis
# TODO: Reenable once kinks worked out.
# notifications:
# webhooks: https://ufci1w66n3.execute-api.us-west-2.amazonaws.com/stage/travis
68 changes: 12 additions & 56 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ all: banner generate build
.PHONY: banner
banner:
@echo -e "\033[1;37m=========================\033[0m"
@echo -e "\033[1;37mPulumi Documentation Site\033[0m"
@echo -e "\033[1;37mPulumi Website \033[0m"
@echo -e "\033[1;37m=========================\033[0m"

.PHONY: ensure
Expand Down Expand Up @@ -59,79 +59,35 @@ validate:
$(MAKE) test
pkill -f hugo

.PHONY: preview
preview:
@echo -e "\033[0;32mPREVIEW:\033[0m"
ifeq ($(TRAVIS_BRANCH),master)
./scripts/preview.sh staging
endif
ifeq ($(TRAVIS_BRANCH),production)
./scripts/preview.sh production
endif
ifeq ($(TRAVIS_BRANCH),fusion)
./scripts/preview.sh fusion
endif

.PHONY: deploy
deploy:
@echo -e "\033[0;32mDEPLOY:\033[0m"
ifeq ($(TRAVIS_BRANCH),master)
./scripts/update.sh staging
endif
ifeq ($(TRAVIS_BRANCH),production)
./scripts/update.sh production
endif
ifeq ($(TRAVIS_BRANCH),fusion)
./scripts/update.sh fusion
endif

.PHONY: travis_push
travis_push::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
else ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://fusion.pulumi.io/ $(MAKE) build
# NB. Replace with `master` after `fusion` branch merged.
ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
./scripts/run-pulumi.sh update staging
else
$(MAKE) build
endif
$(MAKE) deploy

.PHONY: travis_pull_request
travis_pull_request::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
else ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://fusion.pulumi.io/ $(MAKE) build
# NB. Replace with `master` after `fusion` branch merged.
ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh preview staging
else
$(MAKE) build
endif
$(MAKE) validate
$(MAKE) preview
endif

.PHONY: travis_cron
travis_cron::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
else ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://fusion.pulumi.io/ $(MAKE) build
else
$(MAKE) build
endif

.PHONY: travis_api
travis_api::
$(MAKE) banner
$(MAKE) ensure
ifeq ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
else ifeq ($(TRAVIS_BRANCH),fusion)
HUGO_BASEURL=https://fusion.pulumi.io/ $(MAKE) build
else
$(MAKE) build
endif
$(MAKE) validate
3 changes: 3 additions & 0 deletions infrastructure-old/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/bin/
/node_modules/
/.pulumi/
3 changes: 3 additions & 0 deletions infrastructure-old/Pulumi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: pulumi.io
description: Pulumi.io, documentation and more for all things Pulumi.
runtime: nodejs
Loading