Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@ jobs:
# Downloading artifacts to new instances is already convenient via aws credentials and cli
run: (cd deploy && npm run upload ${{ inputs.environment }})

# FIXME: Deploy will fail unless removed elastic IP addresses restored/replaced
- name: Deploy
run: (cd deploy && npm start ${{ inputs.environment }})
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
uses: ./.github/workflows/branch.yml
secrets: inherit

main-deploy:
needs:
- main-branch
uses: ./.github/workflows/deploy.yml
with:
environment: production
url: https://www.trshcmpctr.com
secrets: inherit
# main-deploy:
# needs:
# - main-branch
# uses: ./.github/workflows/deploy.yml
# with:
# environment: production
# url: https://www.trshcmpctr.com
# secrets: inherit
16 changes: 8 additions & 8 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
uses: ./.github/workflows/branch.yml
secrets: inherit

stage-deploy:
needs:
- stage-branch
uses: ./.github/workflows/deploy.yml
with:
environment: staging
url: https://www-stage.trshcmpctr.com
secrets: inherit
# stage-deploy:
# needs:
# - stage-branch
# uses: ./.github/workflows/deploy.yml
# with:
# environment: staging
# url: https://www-stage.trshcmpctr.com
# secrets: inherit
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Notes specifically for repository maintainers

* can't upgrade to/past [@microsoft/rush@5.132.0](https://github.com/microsoft/rushstack/blob/a9b6c472c31676e5ae4fcd594c311a6b6029e82e/apps/rush/CHANGELOG.md#51320)
since changes to `decoupledLocalDependencies`
* (@trshcmpctr/client) start command:
[webpack-dev-middleware] HookWebpackError: HMR is not implemented for module chunk format yet

## TODOs

Expand Down
3 changes: 3 additions & 0 deletions deploy/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ if (!environmentArgument) {
*/
const getElasticIpAllocationId = environment => {
if (environment === 'staging') {
// FIXME: this elastic IP is removed
// www-stage.trshcmcptr.com
return 'eipalloc-0b8f0bb1660204bec';
}

if (environment === 'production') {
// FIXME: this elastic IP is removed
// www.trshcmpctr.com
return 'eipalloc-022c7934990a883c8';
}
Expand Down Expand Up @@ -131,6 +133,7 @@ if (!isReady) {
throw new Error(`next instance not running after polling ${attempts} times`);
}

// FIXME: Deploy will fail unless removed elastic IP addresses restored/replaced
// try to assign environment elastic ip address to new instance
try {
await ec2AssociateIp(nextInstanceId, getElasticIpAllocationId(environmentArgument));
Expand Down