Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy staging domains onto staging envrionment (Leonis) #269

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Deploy staging domains onto staging envrionment (Leonis) #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39ac9df
Update package.json to deploy staging to Leonis
Shinsina Oct 17, 2023
e00332c
Regenerate GHA workflows using changes
Shinsina Oct 17, 2023
b53b78f
Include leonis environment in docker-compose
Shinsina Oct 17, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy-production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ 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:
slack-thread: ${{ needs.notify-start.outputs.slack-thread }}

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:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/deploy-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ 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:
slack-thread: ${{ needs.notify-start.outputs.slack-thread }}

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:
Expand All @@ -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! #^#
###############################################
Expand All @@ -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! #^#
###############################################
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 6 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
7 changes: 6 additions & 1 deletion sites/ccnewsnow.com/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion sites/diverseeducation.com/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion sites/diversemilitary.net/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion sites/divhealth.net/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down