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

Trunk deployment #1540

Closed
wants to merge 6 commits into from
Closed

Trunk deployment #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1f23e2
first attempt
TangoYankee Apr 19, 2024
cc4f05d
heroku env variable
TangoYankee Apr 22, 2024
fecbcd2
wkdir and node 14
TangoYankee Apr 22, 2024
88a6963
staging and production for netlify
TangoYankee Apr 22, 2024
6c34c91
netlify action environments
TangoYankee Apr 22, 2024
5497ca3
prefix github prefix
TangoYankee Apr 25, 2024
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
81 changes: 81 additions & 0 deletions .github/workflows/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: Deploy to production

on: workflow_dispatch

jobs:
build-server:
name: Build production server
environment:
name: production
url: https://zap.planning.nyc.gov
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: 'main'
sparse-checkout: server
- uses: akhileshns/[email protected]
name: Deploy server to Heroku
with:
heroku_email: ${{secrets.HEROKU_EMAIL}}
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: $${{secrets.HEROKU_APP_NAME}}
team: ${{secrets.HEROKU_TEAM}}
appdir: server
env:
AUTHORITY_HOST_URL: ${{secrets.AUTHORITY_HOST_URL}}
CLIENT_ID: ${{secrets.CLIENT_ID}}
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
CRM_HOST: ${{secrets.CRM_HOST}}
CRM_SIGNING_SECRET: ${{secrets.CRM_SIGNING_SECRET}}
CRM_URL_PATH: ${{secrets.CRM_URL_PATH}}
GITHUB_ACCESS_TOKEN: ${{secrets.GITHUB_ACCESS_TOKEN}}
NYCID_CONSOLE_PASSWORD: ${{secrets.NYCID_CONSOLE_PASSWORD}}
RECAPTCHA_SECRET_KEY: ${{secrets.RECAPTCHA_SECRET_KEY}}
RECAPTCHA_SITE_KEY: ${{secrets.RECAPTCHA_SITE_KEY}}
TENANT_ID: ${{secrets.TENANT_ID}}
TOKEN_PATH: ${{secrets.TOKEN_PATH}}
ADO_PRINCIPAL: ${{secrets.ADO_PRINCIPAL}}
CRM_ADMIN_SERVICE_USER: ${{secrets.CRM_ADMIN_SERVICE_USER}}
SHAREPOINT_CLIENT_ID: ${{secrets.SHAREPOINT_CLIENT_ID}}
SHAREPOINT_CLIENT_SECRET: ${{secrets.SHAREPOINT_CLIENT_SECRET}}
SHAREPOINT_CRM_SITE: ${{secrets.SHAREPOINT_CRM_SITE}}
SHAREPOINT_TARGET_HOST: ${{secrets.SHAREPOINT_TARGET_HOST}}
build-client:
name: Build production client
environment: production
runs-on: ubuntu-latest
env:
NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
HOST: ${{secrets.ZAP_API_HOST}}
NYCID_CLIENT_ID: ${{secrets.NYCID_CLIENT_ID}}
NYC_ID_HOST: ${{secrets.NYC_ID_HOST}}
MAINTENANCE_START: ${{secrets.MAINTENANCE_START}}
MAINTENANCE_END: ${{secrets.MAINTENANCE_END}}
steps:
- uses: actions/checkout@v4
with:
ref: 'main'
sparse-checkout: client
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 14.x
- name: Install dependencies
working-directory: client
run: yarn install --prod --frozen-lockfile
- name: Set environment variables
working-directory: client
run: |
echo "NETLIFY_SITE_ID=$NETLIFY_SITE_ID" >> .env
echo "NETLIFY_AUTH_TOKEN=$NETLIFY_AUTH_TOKEN" >> .env
echo "ZAP_API_HOST=$ZAP_API_HOST" >> .env
echo "NYCID_CLIENT_ID=$NYCID_CLIENT_ID" >> .env
echo "NYC_ID_HOST=$NYC_ID_HOST" >> .env
echo "MAINTENANCE_START=$MAINTENANCE_START" >> .env
echo "MAINTENANCE_END=$MAINTENANCE_END" >> .env
- name: Deploy client to Netlify
## run: npx netlify-cli deploy --build --prod
run: npx netlify-cli deploy --build --alias production-action

83 changes: 83 additions & 0 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Deploy to staging

on:
push:
branches:
- main

jobs:
build-server:
name: Build staging server
environment:
name: staging
url: https://zap-staging.planninglabs.nyc
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: 'main'
sparse-checkout: server
- uses: akhileshns/[email protected]
name: Deploy server to Heroku
with:
heroku_email: ${{secrets.HEROKU_EMAIL}}
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: $${{secrets.HEROKU_APP_NAME}}
team: ${{secrets.HEROKU_TEAM}}
appdir: server
env:
AUTHORITY_HOST_URL: ${{secrets.AUTHORITY_HOST_URL}}
CLIENT_ID: ${{secrets.CLIENT_ID}}
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
CRM_HOST: ${{secrets.CRM_HOST}}
CRM_SIGNING_SECRET: ${{secrets.CRM_SIGNING_SECRET}}
CRM_URL_PATH: ${{secrets.CRM_URL_PATH}}
GITHUB_ACCESS_TOKEN: ${{secrets.FEEDBACK_GITHUB_ACCESS_TOKEN}}
NYCID_CONSOLE_PASSWORD: ${{secrets.NYCID_CONSOLE_PASSWORD}}
RECAPTCHA_SECRET_KEY: ${{secrets.RECAPTCHA_SECRET_KEY}}
RECAPTCHA_SITE_KEY: ${{secrets.RECAPTCHA_SITE_KEY}}
TENANT_ID: ${{secrets.TENANT_ID}}
TOKEN_PATH: ${{secrets.TOKEN_PATH}}
ADO_PRINCIPAL: ${{secrets.ADO_PRINCIPAL}}
CRM_ADMIN_SERVICE_USER: ${{secrets.CRM_ADMIN_SERVICE_USER}}
SHAREPOINT_CLIENT_ID: ${{secrets.SHAREPOINT_CLIENT_ID}}
SHAREPOINT_CLIENT_SECRET: ${{secrets.SHAREPOINT_CLIENT_SECRET}}
SHAREPOINT_CRM_SITE: ${{secrets.SHAREPOINT_CRM_SITE}}
SHAREPOINT_TARGET_HOST: ${{secrets.SHAREPOINT_TARGET_HOST}}
build-client:
name: Build staging client
environment: staging
runs-on: ubuntu-latest
env:
NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
HOST: ${{secrets.ZAP_API_HOST}}
NYCID_CLIENT_ID: ${{secrets.NYCID_CLIENT_ID}}
NYC_ID_HOST: ${{secrets.NYC_ID_HOST}}
MAINTENANCE_START: ${{secrets.MAINTENANCE_START}}
MAINTENANCE_END: ${{secrets.MAINTENANCE_END}}
steps:
- uses: actions/checkout@v4
with:
ref: 'main'
sparse-checkout: client
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 14.x
- name: Install dependencies
working-directory: client
run: yarn install --prod --frozen-lockfile
- name: Set environment variables
working-directory: client
run: |
echo "NETLIFY_SITE_ID=$NETLIFY_SITE_ID" >> .env
echo "NETLIFY_AUTH_TOKEN=$NETLIFY_AUTH_TOKEN" >> .env
echo "ZAP_API_HOST=$ZAP_API_HOST" >> .env
echo "NYCID_CLIENT_ID=$NYCID_CLIENT_ID" >> .env
echo "NYC_ID_HOST=$NYC_ID_HOST" >> .env
echo "MAINTENANCE_START=$MAINTENANCE_START" >> .env
echo "MAINTENANCE_END=$MAINTENANCE_END" >> .env
- name: Deploy client to Netlify
run: npx netlify-cli deploy --build --alias staging-action

7 changes: 3 additions & 4 deletions .github/workflows/main.yml → .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: Build
name: Test

on:
push:
branches:
- master
- develop
- main
pull_request:

jobs:
Expand All @@ -15,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
working-directory: client
Expand Down
13 changes: 0 additions & 13 deletions netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,3 @@
command = "yarn build --environment=production"
ignore = "false"

[context.develop]
environment = { HOST="https://zap-api-staging.herokuapp.com", NYCID_CLIENT_ID="lup-portal-staging", NYC_ID_HOST="https://accounts-nonprd.nyc.gov/account", MAINTENANCE_START='06/01/22 15:00', MAINTENANCE_END='06/01/22 16:00' }

[context.master]
environment = { HOST="https://zap-api-production.herokuapp.com", NYCID_CLIENT_ID="lup-portal-production", NYC_ID_HOST="https://www1.nyc.gov/account", MAINTENANCE_START='06/01/22 15:00', MAINTENANCE_END='06/01/22 16:00' }

# qa team
[context.qa]
environment = { HOST="https://zap-api-staging.herokuapp.com", NYCID_CLIENT_ID="lup-portal-staging", NYC_ID_HOST="https://accounts-nonprd.nyc.gov/account", MAINTENANCE_START='06/01/22 15:00', MAINTENANCE_END='06/01/22 16:00' }

# deploy-preview
[context.deploy-preview]
environment = { HOST="https://zap-api-staging.herokuapp.com", NYCID_CLIENT_ID="lup-portal-staging", NYC_ID_HOST="https://accounts-nonprd.nyc.gov/account", MAINTENANCE_START='06/01/22 15:00', MAINTENANCE_END='06/01/22 16:00' }
Loading