From f66abe42742afd75d26a77c1267ed5065d5e2ad2 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Tue, 2 Jul 2019 13:42:26 -0700 Subject: [PATCH 1/2] Hook up new www.pulumi.com/production stack to CI/CD --- Makefile | 26 ++++++++++++++++++++++---- infrastructure/Pulumi.production.yaml | 5 +++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 infrastructure/Pulumi.production.yaml diff --git a/Makefile b/Makefile index 7b6cca055789..0b21a09116f4 100644 --- a/Makefile +++ b/Makefile @@ -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 +ifeq ($(TRAVIS_BRANCH),master) + HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build + $(MAKE) validate + ./scripts/run-pulumi.sh update staging +ifeq ($(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 +ifeq ($(TRAVIS_BRANCH),master) + HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build + $(MAKE) validate + ./scripts/run-pulumi.sh preview staging +ifeq ($(TRAVIS_BRANCH),production) + HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build + $(MAKE) validate + ./scripts/run-pulumi.sh preview production else $(MAKE) build $(MAKE) validate diff --git a/infrastructure/Pulumi.production.yaml b/infrastructure/Pulumi.production.yaml new file mode 100644 index 000000000000..b0b859be6733 --- /dev/null +++ b/infrastructure/Pulumi.production.yaml @@ -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 From 89c4626a894842c75fb261f40e054e41354ae431 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Tue, 2 Jul 2019 14:24:16 -0700 Subject: [PATCH 2/2] Correct Makefile syntax --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0b21a09116f4..9759a1f36f1d 100644 --- a/Makefile +++ b/Makefile @@ -68,11 +68,11 @@ ifeq ($(TRAVIS_BRANCH),fuion) HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build $(MAKE) validate ./scripts/run-pulumi.sh update staging -ifeq ($(TRAVIS_BRANCH),master) +else ($(TRAVIS_BRANCH),master) HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build $(MAKE) validate ./scripts/run-pulumi.sh update staging -ifeq ($(TRAVIS_BRANCH),production) +else ($(TRAVIS_BRANCH),production) HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build $(MAKE) validate ./scripts/run-pulumi.sh update production @@ -90,11 +90,11 @@ ifeq ($(TRAVIS_BRANCH),fuion) HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build $(MAKE) validate ./scripts/run-pulumi.sh preview staging -ifeq ($(TRAVIS_BRANCH),master) +else ($(TRAVIS_BRANCH),master) HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build $(MAKE) validate ./scripts/run-pulumi.sh preview staging -ifeq ($(TRAVIS_BRANCH),production) +else ($(TRAVIS_BRANCH),production) HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build $(MAKE) validate ./scripts/run-pulumi.sh preview production