diff --git a/README.md b/README.md index 81d9003..9be0be5 100644 --- a/README.md +++ b/README.md @@ -68,12 +68,11 @@ yo ibm-core-node-express --bluemix='{"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. diff --git a/app/index.js b/app/index.js index 498762e..f1f98d0 100644 --- a/app/index.js +++ b/app/index.js @@ -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 ) { diff --git a/app/templates/Dockerfile-tools b/app/templates/Dockerfile-tools index 8998601..f8573ac 100644 --- a/app/templates/Dockerfile-tools +++ b/app/templates/Dockerfile-tools @@ -6,6 +6,7 @@ WORKDIR "/app" # Bundle app source COPY . /app +COPY run-dev /bin EXPOSE 3000 diff --git a/app/templates/run-dev b/app/templates/run-dev old mode 100644 new mode 100755 diff --git a/prerelease.sh b/prerelease.sh index 782da68..e8c8afd 100755 --- a/prerelease.sh +++ b/prerelease.sh @@ -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" \ No newline at end of file +hub pull-request -b master -m "chore: Merging CHANGELOG and package.json changes" \ No newline at end of file