Merge pull request #471 from platanus/release-beta-2-and-configure-np…

…m-auto-deploy

Release beta 2 and configure npm auto deploy

.circleci/config.yml

@@ -121,6 +121,11 @@ jobs:
             gem build activeadmin_addons.gemspec
             version_tag=$(git describe --tags)
             gem push activeadmin_addons-${version_tag#v}.gem
+      - run:
+          name: Publish to npm
+          command: |
+            npm set //registry.npmjs.org/:_authToken=$NPM_TOKEN
+            npm publish
 
 workflows:
   version: 2

CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Unreleased
 
+-
+
+### 2.0.0.beta-2
+
 #### Breaking changes
 * Defines required ruby version to >=2.7.0 [#460](https://github.com/platanus/activeadmin_addons/pull/460)
 * Nested and search select now use the name of the association instead of the name of id [#462](https://github.com/platanus/activeadmin_addons/pull/462)
@@ -12,6 +16,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 #### Fixes
 * Include only items that belong to parent when using collection option in a nested input level [#463](https://github.com/platanus/activeadmin_addons/pull/463)
 
+### 2.0.0.beta-1
+
+Skipped
+
 ### 2.0.0.beta-0
 
 #### Breaking changes

Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    activeadmin_addons (2.0.0.beta.0)
+    activeadmin_addons (2.0.0.beta.2)
       railties
       redcarpet
       require_all

README.md

@@ -239,14 +239,16 @@ Use default active_admin theme.
 
 ## Publishing
 
-On master/main branch...
-
-1. Change `VERSION` in `lib/activeadmin_addons/version.rb`.
-2. Change `Unreleased` title to current version in `CHANGELOG.md`.
-3. Run `bundle install`.
-4. Commit new release. For example: `Releasing v1.0.0`.
-5. Create tag. For example: `git tag v1.0.0`.
-6. Push tag. For example: `git push origin v1.0.0`.
+On a new branch:
+
+1. Change `VERSION` in `lib/activeadmin_addons/version.rb`. Note that beta versions should have a `.beta` suffix (e.g. `1.0.0.beta.1`).
+2. Change `"version"` in `package.json` to the same version. Note that beta versions should have a `-beta` suffix (e.g. `1.0.0-beta.1`).
+3. Change `Unreleased` title to current version in `CHANGELOG.md`.
+4. Run `bundle install`.
+5. Open a new PR with those changes.
+6. Once the PR is merged, checkout to master and pull the changes.
+8. Create tag. For example: `git tag v1.0.0`.
+9. Push tag. For example: `git push origin v1.0.0`. This will trigger the CI to publish the new version to npm and rubygems.
 
 ## Contributing
 

lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "2.0.0.beta.0"
+  VERSION = "2.0.0.beta.2"
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "activeadmin_addons",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "Set of addons to help with the activeadmin ui",
   "main": "src/all.js",
   "files": [