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
26 changes: 22 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,41 @@ validate:
travis_push::
$(MAKE) banner
$(MAKE) ensure
# NB. Replace with `master` after `fusion` branch merged.
ifeq ($(TRAVIS_BRANCH),fusion)
# NB. Delete fusion once dust settles.
ifeq ($(TRAVIS_BRANCH),fuion)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh update staging
else ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh update staging
else ($(TRAVIS_BRANCH),production)
HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh update production
else
$(MAKE) build
$(MAKE) validate
endif

.PHONY: travis_pull_request
travis_pull_request::
$(MAKE) banner
$(MAKE) ensure
# NB. Replace with `master` after `fusion` branch merged.
ifeq ($(TRAVIS_BRANCH),fusion)
# NB. Delete fusion once dust settles.
ifeq ($(TRAVIS_BRANCH),fuion)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh preview staging
else ($(TRAVIS_BRANCH),master)
HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh preview staging
else ($(TRAVIS_BRANCH),production)
HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build
$(MAKE) validate
./scripts/run-pulumi.sh preview production
else
$(MAKE) build
$(MAKE) validate
Expand Down
5 changes: 5 additions & 0 deletions infrastructure/Pulumi.production.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config:
aws:region: us-west-2
www.pulumi.com:certificateArn: arn:aws:acm:us-east-1:058607598222:certificate/a3f72a2b-e715-4639-b126-1e4efc0b634b
www.pulumi.com:pathToWebsiteContents: ../public
www.pulumi.com:targetDomain: wwww-production.pulumi.com