From 39ac9df57812778a6d8639d25b073426158d20d4 Mon Sep 17 00:00:00 2001 From: Shinsina Date: Tue, 17 Oct 2023 13:49:06 -0500 Subject: [PATCH 1/3] Update package.json to deploy staging to Leonis --- sites/ccnewsnow.com/package.json | 7 ++++++- sites/diverseeducation.com/package.json | 7 ++++++- sites/diversemilitary.net/package.json | 7 ++++++- sites/divhealth.net/package.json | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sites/ccnewsnow.com/package.json b/sites/ccnewsnow.com/package.json index 86d496f1..5e88d530 100644 --- a/sites/ccnewsnow.com/package.json +++ b/sites/ccnewsnow.com/package.json @@ -11,7 +11,12 @@ "account": "diverse", "stack": "virgon", "key": "ccn", - "deploy": true + "deploy": { + "production": true, + "staging": { + "stack": "leonis" + } + } }, "scripts": { "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1", diff --git a/sites/diverseeducation.com/package.json b/sites/diverseeducation.com/package.json index 4e1a5cd1..e38b897f 100644 --- a/sites/diverseeducation.com/package.json +++ b/sites/diverseeducation.com/package.json @@ -11,7 +11,12 @@ "account": "diverse", "stack": "virgon", "key": "de", - "deploy": true + "deploy": { + "production": true, + "staging": { + "stack": "leonis" + } + } }, "scripts": { "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1", diff --git a/sites/diversemilitary.net/package.json b/sites/diversemilitary.net/package.json index 1ad201e1..83edd7dd 100644 --- a/sites/diversemilitary.net/package.json +++ b/sites/diversemilitary.net/package.json @@ -11,7 +11,12 @@ "account": "diverse", "stack": "virgon", "key": "dm", - "deploy": true + "deploy": { + "production": true, + "staging": { + "stack": "leonis" + } + } }, "scripts": { "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1", diff --git a/sites/divhealth.net/package.json b/sites/divhealth.net/package.json index d442571d..55687b74 100644 --- a/sites/divhealth.net/package.json +++ b/sites/divhealth.net/package.json @@ -11,7 +11,12 @@ "account": "diverse", "stack": "virgon", "key": "dh", - "deploy": true + "deploy": { + "production": true, + "staging": { + "stack": "leonis" + } + } }, "scripts": { "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1", From e00332c98ec352c9223be2f0f30075134464b6cd Mon Sep 17 00:00:00 2001 From: Shinsina Date: Tue, 17 Oct 2023 13:49:33 -0500 Subject: [PATCH 2/3] Regenerate GHA workflows using changes --- .github/workflows/deploy-production.yml | 4 ++-- .github/workflows/deploy-staging.yml | 16 ++++++++-------- .github/workflows/integration-tests.yml | 3 +++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 4cb33730..5438693b 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -26,7 +26,7 @@ jobs: post-deploy-failure: if: failure() - needs: [notify-start, deploy-sites] + needs: [notify-start, build-sites, deploy-sites] uses: parameter1/actions/.github/workflows/notify-fail.yml@main secrets: inherit with: @@ -34,7 +34,7 @@ jobs: post-deploy-complete: if: success() - needs: [notify-start, deploy-sites] + needs: [notify-start, build-sites, deploy-sites] uses: parameter1/actions/.github/workflows/notify-complete.yml@main secrets: inherit with: diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index 95eea720..3204f158 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -25,7 +25,7 @@ jobs: post-deploy-failure: if: failure() - needs: [notify-start, deploy-sites] + needs: [notify-start, build-sites, deploy-sites] uses: parameter1/actions/.github/workflows/notify-fail.yml@main secrets: inherit with: @@ -33,7 +33,7 @@ jobs: post-deploy-complete: if: success() - needs: [notify-start, deploy-sites] + needs: [notify-start, build-sites, deploy-sites] uses: parameter1/actions/.github/workflows/notify-complete.yml@main secrets: inherit with: @@ -53,9 +53,9 @@ jobs: ############################################### site: - { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com } - - { dir: diverseeducation.com, stack: virgon, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com } - - { dir: diversemilitary.net, stack: virgon, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net } - - { dir: divhealth.net, stack: virgon, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net } + - { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com } + - { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net } + - { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net } ############################################### #^# Make sure this matches the site matrix! #^# ############################################### @@ -76,9 +76,9 @@ jobs: ############################################### site: - { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com } - - { dir: diverseeducation.com, stack: virgon, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com } - - { dir: diversemilitary.net, stack: virgon, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net } - - { dir: divhealth.net, stack: virgon, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net } + - { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com } + - { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net } + - { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net } ############################################### #^# Make sure this matches the site matrix! #^# ############################################### diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index aebfbf57..4d075429 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -16,6 +16,9 @@ jobs: ############################################### site: - { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com } + - { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com } + - { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net } + - { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net } - { dir: diverseeducation.com, stack: virgon, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com } - { dir: diversemilitary.net, stack: virgon, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net } - { dir: divhealth.net, stack: virgon, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net } From b53b78f9e17fb40b4423cee9b22abfdc8c7f7ffa Mon Sep 17 00:00:00 2001 From: Shinsina Date: Tue, 17 Oct 2023 13:49:43 -0500 Subject: [PATCH 3/3] Include leonis environment in docker-compose --- docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index cdbf0148..6a345558 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,12 @@ x-env-defaults: &env ENABLE_CONTENT_METER: ${ENABLE_CONTENT_METER-false} IDX_NAV_ENABLE: ${IDX_NAV_ENABLE-false} +x-env-leonis: &env-leonis + GRAPHQL_URI: ${GRAPHQL_URI-https://graphql.leonis.base.parameter1.com} + OEMBED_URI: ${OEMBED_URI-https://oembed.leonis.base.parameter1.com} + RSS_URI: ${RSS_URI-https://rss.leonis.base.parameter1.com} + SITEMAPS_URI: ${SITEMAPS_URI-https://sitemaps.leonis.base.parameter1.com} + x-env-virgon: &env-virgon GRAPHQL_URI: ${GRAPHQL_URI-https://virgon.graphql.base.parameter1.com} OEMBED_URI: ${OEMBED_URI-https://virgon.oembed.base.parameter1.com}