-
Notifications
You must be signed in to change notification settings - Fork 901
ml5 notes (TEMP)
Joey Lee edited this page Jan 30, 2020
·
3 revisions
- Branches of importance:
-
release
: the version that is on the CDN and published to NPM -
development
: for new features not yet in release -
gh-pages
:for documentation
-
-
Admin access to the ml5
npm
account and two-factor authentication setup fornpm
-
Admin access to the ml5
github
account
When doing a release in ml5, the following repositories need to also be updated:
- ml5js/ml5-library
- ml5js/ml5-examples
- ml5js/ml5-website
- ml5js/ml5-boilerplate
The following Parts 1 - 4 go through the process of making a new ml5 release.
- Create a new branch from
development
with a name that matches the new release version:v<#>.<#>.<#>
$ (development): git checkout -b v0.4.2
- Update the
version
in package.json and run the npm scripts to update theREADME.md
and thedocs
with the latest version number. Add and commit your changes and push that branch up toremote
.
# Step 0: change the version in package.json from 0.4.1 to 0.4.2
# Step 1: run the script to update your readme
$ (v0.4.2): npm run update:readme
# Step 2: run the script to update the docs
$ (v0.4.2): oldversion=0.4.1 npm run update:docs
# Step 3: add, commit, and push your changes up
$ (v0.4.2): git add .
$ (v0.4.2): git commit -m "bumps version and updates ml5 version number"
$ (v0.4.2): git push origin v0.4.2
- Make a Pull Request to merge
v<#>.<#>.<#>
todevelopment
. Wait for tests to pass. Squash and merge.
# Once you've squashed and merged `v0.4.2` to `development`...
# Step 1: switch to your development branch and pull in those changes
$ (v0.4.2): git checkout development
$ (development): git fetch
$ (development): git pull
- With these changes now in
development
make a new Pull Request to mergedevelopment
intorelease
. Wait for tests to pass. Squash and merge.
# Once you've squashed and merged `development` to `release`...
# Step 1: switch to your release branch and pull in those changes
$ (development): git checkout release
$ (release): git fetch
$ (release): git pull
- Install the dependencies to ensure you've got all the latest dependencies and Build the library to prepare for the release.
$ (release): npm install
$ (release): npm run build
- Publish to npm:
$ (release): npm publish
# you will be asked for the OTP (one time password)
# Enter the 6 digit MFA numbers using your authenticator app
- Add all of your changes to
gh-pages
to publish the latest docs
$ (release): git checkout gh-pages $ (gh-pages): git merge release $ (gh-pages): git push origin gh-pages
8. Make a new Github Release and Tag the release. Add release notes describing the changes for the new version.
***
### Part 2: `ml5-examples`
In `ml5-examples` the **release** branch is our source of truth. Any fixes or new examples based on the **current ml5 version** will be directly merged into the **release** branch.
The **development** branch is used in conjunction with the ml5-library **development** branch. What is different from the **release** branch is that all of the `index.html` files have their ml5 set to `localhost:8080` rather than the ml5 CDN.
If we are doing a new release, this means that the new examples and features added to the **development** branch of `ml5-examples` needs to be merged with the **release** branch.
The one thing to note is that the following steps are to handle merge conflicts that arise from running `npm run update:ml5-dev` to convert the ml5 script src.
***
1. Create a new branch from `release` with a name that matches the new release version: `v<#>.<#>.<#>`
```sh
$ (development): git checkout -b v0.4.2
- Update the
version
in package.json. Update all of thelocalhost
references to the ml5 CDN and create the new examples index.
# Step 0: change the version in package.json from 0.4.1 to 0.4.2
# Step 1: update all of the localhost references to from ml5 CDN to localhosy
$ (v0.4.2): npm run update:ml5-dev
$ (v0.4.2): git add .
- Merge the changes from release into
v<#>.<#>.<#>
branch.
$ (v0.4.2): git merge development
- Make a Pull Request to merge
v<#>.<#>.<#>
torelease
. Wait for tests to pass. Squash and merge.
# Once you've squashed and merged `v0.4.2` to `development`...
# Step 1: switch to your development branch and pull in those changes
$ (v0.4.2): git checkout release
$ (release): git fetch
$ (release): git pull
- Add all of your changes to
gh-pages
to publish the latest docs
$ (release): git checkout gh-pages
$ (gh-pages): git merge release
$ (gh-pages): git push origin gh-pages
- Merge all the latest changes from release to development and revert all of the ml5 URLs in
development
back tolocalhost
:
$ (gh-pages): git checkout development
$ (development): npm run update:ml5
$ (development): git add .
$ (development): git merge release
# merge
$ (development): npm run update:ml5-dev
$ (development): git add .
$ (development): git commit -m "sets ml5 to localhost"
$ (development): git push origin development
- Make a new Github Release and Tag the release. Add release notes describing the changes for the new version.
- Create a new branch from
master
with a name that matches the new release version:v<#>.<#>.<#>
$ (master): git checkout -b v0.4.2
- Update the version reference and the date last updated in the file
ml5-website/docs/index.md
. Add and commit and push your changes.$ (v0.4.2): git add . $ (v0.4.2): git commit -m "bumps version" $ (v0.4.2): git push origin v0.4.2
- On Github: Make a Pull Request to merge
v0.4.2
tomaster
. Wait for tests to pass, then squash and merge.
- Checkout
with-p5
update the version, add and commit your changes, and push up to the remote branch.# update the ml5 version to version 0.4.2 in index.html $ (with-p5): git add . $ (with-p5): git commit -m "bumps version" $ (with-p5): git push origin with-p5
- Checkout
without-p5
update the version, add and commit your changes, and push up to the remote branch.# update the ml5 version to version 0.4.2 in index.html $ (without-p5): git add . $ (without-p5): git commit -m "bumps version" $ (without-p5): git push origin without-p5