Skip to content
This repository was archived by the owner on Feb 28, 2020. It is now read-only.
Merged
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
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,11 @@ yo ibm-core-node-express --bluemix='{"name":"<project-name>","backendPlatform":"

## Publishing Changes

In order to publish changes, you will need to fork the repository or ask to join the `ibm-developer` org and branch off the development branch.
In order to publish changes, you will need to fork the repository or ask to join the `ibm-developer` org and branch off the `master` branch.

Make sure to follow the [conventional commit specification](https://conventionalcommits.org/) before contributing. To help you with commit a commit template is provide.
Run `config.sh` to initialize the commit template to your `.git/config`.
Make sure to follow the [conventional commit specification](https://conventionalcommits.org/) before contributing. To help you with commit a commit template is provide. Run `config.sh` to initialize the commit template to your `.git/config`.

Once you are finished with your changes, run `npm test` to make sure all tests pass.

Do a pull request against `development`, make sure the build passes. A team member will review and merge your pull request.
Once merged from `development` to `master` one pull request will be created against development. Merge the pull request then create another pull request from `development` into `master`. Once the final pull request has been merged the generator will be published to npm. Make sure that the CHANGELOG.md and the package.json is correct before merging the auto generated pull request.
Do a pull request against `master`, make sure the build passes. A team member will review and merge your pull request.
Once merged to `master` one pull request will be created against `master`. Make sure that the CHANGELOG.md and the package.json is correct before merging the auto generated pull request. After the autogenerated pull request has been merged to `master` the version will be bumped and published to npm.
1 change: 1 addition & 0 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ module.exports = class extends Generator {
this.fs.copyTpl(this.templatePath('Dockerfile-tools'), this.destinationPath('Dockerfile-tools'), this.options);
this.fs.copyTpl(this.templatePath('package.json'), this.destinationPath('package.json'), this.options);
this.fs.copyTpl(this.templatePath('README.md'), this.destinationPath('README.md'), this.options);
this.fs.copyTpl(this.templatePath('run-dev'), this.destinationPath('run-dev'), this.options);

// if project will have swagger doc, ensure swagger ui and api route
if ( this.options.genSwagger ) {
Expand Down
1 change: 1 addition & 0 deletions app/templates/Dockerfile-tools
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ WORKDIR "/app"

# Bundle app source
COPY . /app
COPY run-dev /bin

EXPOSE 3000

Expand Down
Empty file modified app/templates/run-dev
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion prerelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ npm run version
git remote rm origin
git remote add origin $GITHUB_URL_SECURED
git push --follow-tags --set-upstream origin $BRANCH
hub pull-request -b development -m "chore: Merging CHANGELOG and package.json changes"
hub pull-request -b master -m "chore: Merging CHANGELOG and package.json changes"