Skip to content

Commit 69d4c38

Browse files
authored
Merge pull request #760 from ember-learn/amyrlam-patch-1
Update staging and add deploy instructions to README
2 parents 70b5d7d + a11ecf5 commit 69d4c38

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

DEPLOYING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ branch," and select the branch you wish to deploy to staging.
2020

2121
First, deploy the `master` branch to staging following the steps above, and check it over thoroughly. Get a second person to look it over too. There are many variables that could affect how an app displays in production compared to locally, particularly for this app.
2222

23-
Never click the "promote to production" button on Heroku. We shouldn't promote from staging with this button because Heroku uses the same build from staging in the production container. This would mean that the variables set during ember builds get reused. Some of these variables have different values between staging and production, which leads to issues.
23+
**Never click the "promote to production" button on Heroku.** We shouldn't promote from staging with this button because Heroku uses the same build from staging in the production container. This would mean that the variables set during ember builds get reused. Some of these variables have different values between staging and production, which leads to issues.
2424

25-
To deploy properly to production, click on the arrows for the `ember-api-docs` instance under Production,
26-
choose "Deploy a branch" and choose the branch name.
25+
To deploy properly to production, click on the arrows for the `ember-api-docs` instance under Production, choose "Deploy a branch" and choose the branch name.
2726

2827
### Rolling back to an earlier version
2928

README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ View at http://localhost:4200
5151

5252
To run a11y tests, run `test_a11y=yes ember serve`
5353

54-
## Staging Environment
55-
Latest changes from master can be seen on https://ember-api-docs-frontend-staging.global.ssl.fastly.net/
56-
57-
### Linting
54+
## Linting
5855

5956
* `yarn run lint:hbs`
6057
* `yarn run lint:js`
6158
* `yarn run lint:js -- --fix`
6259

63-
### Building
60+
## Staging and Deployment
61+
62+
See the [DEPLOYING.md](https://github.com/ember-learn/ember-api-docs/blob/master/DEPLOYING.md) guide for instructions.
63+
64+
## Building
6465

6566
Cross-browser testing provided by:
6667

0 commit comments

Comments
 (0)