From 17957f641514d4f258e8ab5ef6a16a441396ee21 Mon Sep 17 00:00:00 2001 From: Kumaraguru Periyasamy Kanthasamy <48932104+GuruPKK@users.noreply.github.com> Date: Thu, 3 Feb 2022 10:19:54 -0800 Subject: [PATCH 1/7] Update Makefile --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 4fe31c252a1..ee74cae538a 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,14 @@ PRODUCTION_URL="https://docs.mongodb.com" STAGING_BUCKET=docs-mongodb-org-stg PRODUCTION_BUCKET=docs-mongodb-org-prd +ifeq ($(ENV), 'dotcom_stg') + STAGING_URL="https://docs-mongodborg-staging.corp.mongodb.com" + STAGING_BUCKET=docs-mongodb-org-dotcomstg + +ifeq ($(ENV), 'dotcom_prd') + PRODUCTION_URL="https://docs.mongodb.com" + PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd + # "PROJECT" currently exists to support having multiple projects # within one bucket. For the manual it is empty. PROJECT= From 02d2b54db53a0d24522bb0b508e922cf3afcf6f2 Mon Sep 17 00:00:00 2001 From: Kumaraguru Periyasamy Kanthasamy <48932104+GuruPKK@users.noreply.github.com> Date: Thu, 3 Feb 2022 10:39:59 -0800 Subject: [PATCH 2/7] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ee74cae538a..ecb9ba16f38 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifeq ($(ENV), 'dotcom_stg') STAGING_BUCKET=docs-mongodb-org-dotcomstg ifeq ($(ENV), 'dotcom_prd') - PRODUCTION_URL="https://docs.mongodb.com" + PRODUCTION_URL="https://mongodb.com/docs" PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd # "PROJECT" currently exists to support having multiple projects From 7544ec765f040366ad32bf533b0455aa9e772967 Mon Sep 17 00:00:00 2001 From: Kumaraguru Periyasamy Kanthasamy <48932104+GuruPKK@users.noreply.github.com> Date: Thu, 3 Feb 2022 13:28:07 -0800 Subject: [PATCH 3/7] Update Makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index ecb9ba16f38..63196acf338 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,12 @@ PRODUCTION_BUCKET=docs-mongodb-org-prd ifeq ($(ENV), 'dotcom_stg') STAGING_URL="https://docs-mongodborg-staging.corp.mongodb.com" STAGING_BUCKET=docs-mongodb-org-dotcomstg +endif ifeq ($(ENV), 'dotcom_prd') PRODUCTION_URL="https://mongodb.com/docs" PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd +endif # "PROJECT" currently exists to support having multiple projects # within one bucket. For the manual it is empty. From d05e2fec397796c71e68a1c3fb4740f3be6530c1 Mon Sep 17 00:00:00 2001 From: Kumaraguru Periyasamy Kanthasamy <48932104+GuruPKK@users.noreply.github.com> Date: Wed, 9 Feb 2022 19:42:04 -0800 Subject: [PATCH 4/7] Update Makefile --- Makefile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 63196acf338..39ce275332c 100644 --- a/Makefile +++ b/Makefile @@ -4,20 +4,22 @@ STAGING_URL="https://docs-mongodborg-staging.corp.mongodb.com" PRODUCTION_URL="https://docs.mongodb.com" STAGING_BUCKET=docs-mongodb-org-stg PRODUCTION_BUCKET=docs-mongodb-org-prd +# "PROJECT" currently exists to support having multiple projects +# within one bucket. For the manual it is empty. +PROJECT= +PREFIX= +STGPREFIX= ifeq ($(ENV), 'dotcom_stg') - STAGING_URL="https://docs-mongodborg-staging.corp.mongodb.com" + STAGING_URL="https://mongodbcom-cdn.website.staging.corp.mongodb.com" STAGING_BUCKET=docs-mongodb-org-dotcomstg -endif - -ifeq ($(ENV), 'dotcom_prd') - PRODUCTION_URL="https://mongodb.com/docs" + PRODUCTION_URL="https://mongodb.com" PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd + PREFIX=docs-qa + STGPREFIX=docs endif -# "PROJECT" currently exists to support having multiple projects -# within one bucket. For the manual it is empty. -PROJECT= + DRIVERS_PATH=source/driver-examples @@ -61,8 +63,8 @@ publish: examples ## Builds this branch's publishable HTML and other artifacts u # /. # * Upload each to the S3 bucket under /// stage: ## Host online for review - mut-publish build/${GIT_BRANCH}/html ${STAGING_BUCKET} --prefix=${PROJECT} --stage ${ARGS} - @echo "Hosted at ${STAGING_URL}/${USER}/${GIT_BRANCH}/index.html" + mut-publish build/${GIT_BRANCH}/html ${STAGING_BUCKET} --prefix=${STGPREFIX} --stage ${ARGS} + @echo "Hosted at ${STAGING_URL}/${STGPREFIX}/${USER}/${GIT_BRANCH}/index.html" # - Enter build/public/, as well as any symbolic links pointing # to it, and recurse over each file /. @@ -79,9 +81,9 @@ stage: ## Host online for review # The recursive behavior would CHANGE if --all-subdirectories were # given: ALL contents of build/public/ would be upload deploy: build/public ## Deploy to the production bucket - mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PROJECT} --deploy --redirect-prefix='v[0-9]\.[0-9]' --redirect-prefix='manual' --redirect-prefix='master' ${ARGS} + mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PREFIX} --deploy --redirect-prefix='v[0-9]\.[0-9]' --redirect-prefix='manual' --redirect-prefix='master' ${ARGS} - @echo "Hosted at ${PRODUCTION_URL}/index.html" + @echo "Hosted at ${PRODUCTION_URL}/${PREFIX}/index.html" $(MAKE) deploy-search-index From bc45ba2ff48e6c017729d630b33fa12e67cc4e8c Mon Sep 17 00:00:00 2001 From: Kumaraguru Periyasamy Kanthasamy <48932104+GuruPKK@users.noreply.github.com> Date: Mon, 14 Feb 2022 09:20:31 -0800 Subject: [PATCH 5/7] Update Makefile --- Makefile | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 39ce275332c..734d785b236 100644 --- a/Makefile +++ b/Makefile @@ -7,17 +7,12 @@ PRODUCTION_BUCKET=docs-mongodb-org-prd # "PROJECT" currently exists to support having multiple projects # within one bucket. For the manual it is empty. PROJECT= -PREFIX= -STGPREFIX= - -ifeq ($(ENV), 'dotcom_stg') - STAGING_URL="https://mongodbcom-cdn.website.staging.corp.mongodb.com" - STAGING_BUCKET=docs-mongodb-org-dotcomstg - PRODUCTION_URL="https://mongodb.com" - PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd - PREFIX=docs-qa - STGPREFIX=docs -endif +DOTCOM_STAGING_URL="https://mongodbcom-cdn.website.staging.corp.mongodb.com" +DOTCOM_STAGING_BUCKET=docs-mongodb-org-dotcomstg +DOTCOM_PRODUCTION_URL="https://mongodb.com" +DOTCOM_PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd +DOTCOM_PREFIX=docs-qa +DOTCOM_STGPREFIX=docs @@ -63,8 +58,14 @@ publish: examples ## Builds this branch's publishable HTML and other artifacts u # /. # * Upload each to the S3 bucket under /// stage: ## Host online for review - mut-publish build/${GIT_BRANCH}/html ${STAGING_BUCKET} --prefix=${STGPREFIX} --stage ${ARGS} - @echo "Hosted at ${STAGING_URL}/${STGPREFIX}/${USER}/${GIT_BRANCH}/index.html" + mut-publish build/${GIT_BRANCH}/html ${STAGING_BUCKET} --prefix=${PROJECT} --stage ${ARGS} + @echo "Hosted at ${STAGING_URL}/${PROJECT}/${USER}/${GIT_BRANCH}/index.html" + + mut-publish build/${GIT_BRANCH}/html ${DOTCOM_STAGING_BUCKET} --prefix=${DOTCOM_STGPREFIX} --stage ${ARGS} + @echo "Hosted at ${DOTCOM_STAGING_URL}/${DOTCOM_STGPREFIX}/${USER}/${GIT_BRANCH}/index.html" + + + # - Enter build/public/, as well as any symbolic links pointing # to it, and recurse over each file /. @@ -81,10 +82,17 @@ stage: ## Host online for review # The recursive behavior would CHANGE if --all-subdirectories were # given: ALL contents of build/public/ would be upload deploy: build/public ## Deploy to the production bucket - mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PREFIX} --deploy --redirect-prefix='v[0-9]\.[0-9]' --redirect-prefix='manual' --redirect-prefix='master' ${ARGS} + mut-publish build/public ${PRODUCTION_BUCKET} --prefix=${PROJECT} --deploy --redirect-prefix='v[0-9]\.[0-9]' --redirect-prefix='manual' --redirect-prefix='master' ${ARGS} @echo "Hosted at ${PRODUCTION_URL}/${PREFIX}/index.html" + + mut-publish build/public ${DOTCOM_PRODUCTION_BUCKET} --prefix=${DOTCOM_PREFIX} --deploy --redirect-prefix='v[0-9]\.[0-9]' --redirect-prefix='manual' --redirect-prefix='master' ${ARGS} + + @echo "Hosted at ${DOTCOM_PRODUCTION_URL}/${DOTCOM_PREFIX}/index.html" + + + $(MAKE) deploy-search-index deploy-search-index: ## Update the search index for this branch From a4627568b4abdf3a9b8c017e0f8a55167b50abb5 Mon Sep 17 00:00:00 2001 From: Kumaraguru Periyasamy Kanthasamy <48932104+GuruPKK@users.noreply.github.com> Date: Tue, 15 Feb 2022 13:24:20 -0800 Subject: [PATCH 6/7] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 734d785b236..26e91d86609 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DOTCOM_STAGING_BUCKET=docs-mongodb-org-dotcomstg DOTCOM_PRODUCTION_URL="https://mongodb.com" DOTCOM_PRODUCTION_BUCKET=docs-mongodb-org-dotcomprd DOTCOM_PREFIX=docs-qa -DOTCOM_STGPREFIX=docs +DOTCOM_STGPREFIX=docs-qa From dc1f39702618cd446d46e324dc32bcf1eed8cbaa Mon Sep 17 00:00:00 2001 From: Kumaraguru Periyasamy Kanthasamy <48932104+GuruPKK@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:16:14 -0800 Subject: [PATCH 7/7] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 26e91d86609..b6a7223bee7 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) USER=`whoami` STAGING_URL="https://docs-mongodborg-staging.corp.mongodb.com" PRODUCTION_URL="https://docs.mongodb.com" -STAGING_BUCKET=docs-mongodb-org-stg +STAGING_BUCKET=docs-mongodb-org-prd-staging PRODUCTION_BUCKET=docs-mongodb-org-prd # "PROJECT" currently exists to support having multiple projects # within one bucket. For the manual it is empty.