Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into cs-6996-app-card-impr…
Browse files Browse the repository at this point in the history
…ovements
  • Loading branch information
burieberry committed Jul 30, 2024
2 parents b5e6333 + 8eff160 commit fd45095
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
INPUT_ENVIRONMENT: ${{ inputs.environment }}
run: |
if [ "$INPUT_ENVIRONMENT" = "production" ]; then
echo "OWN_REALM_URL=https://realms.cardstack.com/drafts/" >> $GITHUB_ENV
echo "OTHER_REALM_URLS=https://realms.cardstack.com/published/" >> $GITHUB_ENV
echo "RESOLVED_BASE_REALM_URL=https://realms.cardstack.com/base/" >> $GITHUB_ENV
echo "MATRIX_URL=https://matrix.cardstack.com" >> $GITHUB_ENV
echo "MATRIX_SERVER_NAME=matrix.cardstack.com" >> $GITHUB_ENV
echo "OWN_REALM_URL=https://app.boxel.ai/drafts/" >> $GITHUB_ENV
echo "OTHER_REALM_URLS=https://app.boxel.ai/published/" >> $GITHUB_ENV
echo "RESOLVED_BASE_REALM_URL=https://app.boxel.ai/base/" >> $GITHUB_ENV
echo "MATRIX_URL=https://matrix.boxel.ai" >> $GITHUB_ENV
echo "MATRIX_SERVER_NAME=boxel.ai" >> $GITHUB_ENV
echo "EXPERIMENTAL_AI_ENABLED=true" >> $GITHUB_ENV
elif [ "$INPUT_ENVIRONMENT" = "staging" ]; then
echo "OWN_REALM_URL=https://realms-staging.stack.cards/drafts/" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
if [ "$INPUT_ENVIRONMENT" = "production" ]; then
echo "AWS_ROLE_ARN=arn:aws:iam::120317779495:role/boxel-host" >> $GITHUB_ENV
echo "AWS_S3_BUCKET=cardstack-boxel-host-production" >> $GITHUB_ENV
echo "AWS_CLOUDFRONT_DISTRIBUTION=E2DDEHLJXF5LQ8" >> $GITHUB_ENV
echo "AWS_CLOUDFRONT_DISTRIBUTION=EIY7A542TLTVQ" >> $GITHUB_ENV
elif [ "$INPUT_ENVIRONMENT" = "staging" ]; then
echo "AWS_ROLE_ARN=arn:aws:iam::680542703984:role/boxel-host" >> $GITHUB_ENV
echo "AWS_S3_BUCKET=cardstack-boxel-host-staging" >> $GITHUB_ENV
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/pr-boxel-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,16 @@ jobs:
- name: Deploy boxel-host preview
uses: ./.github/actions/deploy-ember-preview
env:
OWN_REALM_URL: https://realms.cardstack.com/drafts/
OTHER_REALM_URLS: https://realms.cardstack.com/published/
RESOLVED_BASE_REALM_URL: https://realms.cardstack.com/base/
MATRIX_URL: https://matrix.cardstack.com
MATRIX_SERVER_NAME: matrix.cardstack.com
OWN_REALM_URL: https://app.boxel.ai/drafts/
OTHER_REALM_URLS: https://app.boxel.ai/published/
RESOLVED_BASE_REALM_URL: https://app.boxel.ai/base/
MATRIX_URL: https://matrix.boxel.ai
MATRIX_SERVER_NAME: boxel.ai
EXPERIMENTAL_AI_ENABLED: true
S3_PREVIEW_BUCKET_NAME: boxel-host-preview.cardstack.com
AWS_S3_BUCKET: boxel-host-preview.cardstack.com
S3_PREVIEW_BUCKET_NAME: boxel-host-preview.boxel.ai
AWS_S3_BUCKET: boxel-host-preview.boxel.ai
AWS_REGION: us-east-1
AWS_CLOUDFRONT_DISTRIBUTION: E1JS2AYUPFW775
AWS_CLOUDFRONT_DISTRIBUTION: E2PZR9CIAW093B
with:
package: boxel-host
environment: production
24 changes: 12 additions & 12 deletions packages/realm-server/scripts/start-production.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ NODE_NO_WARNINGS=1 \
--port=3000 \
\
--path='/persistent/base' \
--matrixURL='https://matrix.cardstack.com' \
--matrixURL='https://matrix.boxel.ai' \
--username='base_realm' \
--password=${BASE_REALM_PASSWORD} \
--distURL='https://boxel-host.cardstack.com' \
--distURL='https://boxel-host.boxel.ai' \
--fromUrl='https://cardstack.com/base/' \
--toUrl='https://realms.cardstack.com/base/' \
--toUrl='https://app.boxel.ai/base/' \
\
--path='/persistent/drafts' \
--matrixURL='https://matrix.cardstack.com' \
--matrixURL='https://matrix.boxel.ai' \
--username='drafts_realm' \
--password=${DRAFTS_REALM_PASSWORD} \
--fromUrl='https://realms.cardstack.com/drafts/' \
--toUrl='https://realms.cardstack.com/drafts/' \
--fromUrl='https://app.boxel.ai/drafts/' \
--toUrl='https://app.boxel.ai/drafts/' \
\
--path='/persistent/published' \
--matrixURL='https://matrix.cardstack.com' \
--matrixURL='https://matrix.boxel.ai' \
--username='published_realm' \
--password=${PUBLISHED_REALM_PASSWORD} \
--fromUrl='https://realms.cardstack.com/published/' \
--toUrl='https://realms.cardstack.com/published/' \
--fromUrl='https://app.boxel.ai/published/' \
--toUrl='https://app.boxel.ai/published/' \
--fromUrl='https://cardstack.com/base/' \
--toUrl='https://realms.cardstack.com/base/' \
--fromUrl='https://realms.cardstack.com/base/' \
--toUrl='https://realms.cardstack.com/base/'
--toUrl='https://app.boxel.ai/base/' \
--fromUrl='https://app.boxel.ai/base/' \
--toUrl='https://app.boxel.ai/base/'

0 comments on commit fd45095

Please sign in to comment.