diff --git a/Release.markdown b/Release.markdown index b9a78c14..e88e505b 100644 --- a/Release.markdown +++ b/Release.markdown @@ -9,13 +9,13 @@ Follow the instructions in `Contribute.markdown` during development. Please work on feature branches. -Please attempt to keep commits to `master` small, but cohesive. If a feature is contained in a bunch of small commits (e.g., it has several wip commits), please squash them when merging back to `master`. +Please attempt to keep commits to `master` small, but cohesive. If a feature is contained in a bunch of small commits (e.g., it has several wip commits or small work), please squash them when merging back to `master`. ### Version -We attempt to stick to [Semantic Versioning](). Most of the time, development should be against a new minor version - fixing bugs and adding new features that are backwards compatible. +We attempt to stick to [Semantic Versioning](http://semver.org/). Most of the time, development should be against a new minor version - fixing bugs and adding new features that are backwards compatible. -The current version lives in the file `src/version.json`. This file should be set to the version that is _currently_ under development. That is, if version 1.0.0 is the current release then version should be incremented say, to 1.1.0. +The current version lives in the file `/package.json`. This file should be set to the version that is _currently_ under development. That is, if version 1.0.0 is the current release then version should be incremented say, to 1.1.0. This version is used by both `jasmine.js` and the `jasmine-core` Ruby gem. @@ -23,20 +23,25 @@ Note that Jasmine should *not* use the "patch" version number. Let downstream pr ### Update the Github Pages (as needed) +___Note: This is going to change right after 2.0___ + Github pages have to exist in a branch called `gh-pages` in order for their app to serve them. This repo adds that branch as a submodule under the `pages` directory. This is a bit of a hack, but it allows us to work with the pages and the source at the same time and with one set of rake tasks. If you want to submit changes to this repo and aren't a Pivotal Labs employee, you can fork and work in the `gh-pages` branch. You won't be able to edit the pages in the submodule off of master. -The pages are built with [Frank](https://github.com/blahed/frank). All the source for these pages live in the `pages/pages_source` directory. - ## Release When ready to release - specs are all green and the stories are done: -1. Update the version in `version.json` to a release candidate - add a `release_candidate` property with a value of 1 -1. Update any comments on the public interfaces +1. Update the version in `package.json` to a release candidate 1. Update any links or top-level landing page for the Github Pages -1. `thor jasmine_dev:release_prep` - updates the version, builds the `.js` files, builds the standalone release, and builds the Github pages -1. `rake release` - tags the repo with the version, builds the `jasmine-core` gem, pushes the gem to Rubygems.org +1. Build the standalone distribution with `grunt buildStandaloneDist` +1. Make sure you add the new ZIP file to git +1. Copy version to the Ruby gem with `grunt build:copyVersionToGem` +1. __NOTE__: You will likely need to point to a local jasmine gem in order to run tests locally. _Do not_ push this version of the Gemfile. +1. __NOTE__: You will likely need to push a new jasmine gem with a dependent version right after this release. +1. Push these changes to GitHub and verify that this SHA is green +1. `rake release` - tags the repo with the version, builds the `jasmine-core` gem, pushes the gem to Rubygems.org. In order to release you will have to ensure you have rubygems creds locally. + There should be a post to Pivotal Labs blog and a tweet to that link. diff --git a/dist/jasmine-standalone-2.0.0-rc1.zip b/dist/jasmine-standalone-2.0.0-rc1.zip new file mode 100644 index 00000000..441562ff Binary files /dev/null and b/dist/jasmine-standalone-2.0.0-rc1.zip differ diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index e9afa67a..4b5b9040 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -4,6 +4,6 @@ # module Jasmine module Core - VERSION = "2.0.0.alpha" + VERSION = "2.0.0.rc1" end end diff --git a/package.json b/package.json index cfd29227..68806830 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jasmine-core", "license": "MIT", - "version": "2.0.0-alpha", + "version": "2.0.0-rc1", "devDependencies": { "grunt": "~0.4.1", "grunt-contrib-jshint": "~0.2.0",