Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit c953da6

Browse files
committed
chore(scripts): avoid duplicate work and update docs
1 parent 788ddca commit c953da6

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

scripts/private/README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,15 @@ repository. The folder structure of this branch is different to the main master
1818
copied to its own folder.
1919

2020
- **update-gh-pages.sh**: Run this script to copy changes to the tutorial steps and bower
21-
dependencies over to the gh-pages branch.
22-
23-
Once you have updated the local gh-pages branch you can review the changes and push to the remote
24-
gh-pages branch on GitHub.
25-
26-
```
27-
git push origin gh-pages
28-
```
21+
dependencies over to the gh-pages branch and (if all tests pass) push to the remote gh-pages
22+
branch on GitHub.
2923

3024
### Auto-updating Demo Pages from CI
3125

3226
There is a Jenkins job that runs periodically and executes `jenkins.sh`.
3327

3428
- **jenkins.sh**: This script will set the Node.js version to 4.x (using `nvm`), will run all the
35-
tests (using `test-all.sh`) and update the demo pages (using `update-gh-pages.sh`).
29+
the tests and update the demo pages (using `update-gh-pages.sh`).
3630
(You shouldn't need to run this script manually.)
3731

3832
## Pushing to GitHub

scripts/private/jenkins.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@ source ~/.nvm/nvm.sh
66
# Use Node.js v4.x
77
nvm install 4
88

9-
# Run all tests
10-
scripts/private/test-all.sh
11-
12-
# Publish steps on gh-pages
9+
# Run all tests and publish steps on gh-pages
1310
scripts/private/update-gh-pages.sh

scripts/private/test-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
1818
npm install
1919

2020
# Ensure that the chromeDriver is installed
21-
npm run update-webdriver
21+
node_modules/.bin/webdriver-manager update --gecko false --standalone false
2222

2323
# Start up the web server
2424
node_modules/.bin/http-server ./app -a localhost -p 8000 -c-1 --silent &

scripts/private/update-gh-pages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#
77
# The tutorial step changes are computed by checking out each step into a snapshot folder and then
88
# overwriting the step folders in gh-pages with these new ones.
9-
# If there are any changes they will be committed
9+
# If there are any changes they will be committed.
1010
#
1111
# The dependency changes are computed by running "bower update" then committing any changed files
1212
# inside the bower_components folder onto the gh-pages branch.
1313
#
14-
# You should review these commits and push them to origin/gh-pages if valid.
14+
# Finally, the new commits are pushed to origin/gh-pages.
1515

1616
# Exit on error and print each command as it is run
1717
set -ex

0 commit comments

Comments
 (0)