Merge pull request #180 from cyberark/bump-version-5.3.3

Bump version 5.3.3

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [5.3.3] - 2020-08-18
+### Changed
+- Release process is updated to ensure that the published Ruby Gem matches a tag in this repository,
+  so that consumers of this gem can always reference the correct source code included in any given version.
+  [cyberark/conjur-api-ruby](https://github.com/cyberark/conjur-api-ruby/issues/173)
+
 ## 5.3.2 - 2018-09-24
 ### Added
 - Add `Conjur::API.authenticator_list`, `Conjur::API.authenticator_enable`, and
@@ -315,7 +321,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [2.0.0] - 2013-13-12
 
-[Unreleased]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.1...HEAD
+[Unreleased]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.3...HEAD
+[5.3.3]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.1...v5.3.3
 [5.3.1]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.0...v5.3.1
 [5.3.0]: https://github.com/cyberark/conjur-api-ruby/compare/v5.1.0...v5.3.0
 [5.1.0]: https://github.com/cyberark/conjur-api-ruby/compare/v5.0.0...v5.1.0

CONTRIBUTING.md

@@ -120,20 +120,22 @@ $ docker-compose down
 
 ## Releasing
 
-Releasing a new version of this Gem:
+### Update the version and changelog
 
-1. Update the version
-1. Run the release script
+1. Create a new branch for the version bump.
+1. Based on the unreleased content, determine the new version number and update
+    the [version.rb](lib/conjur-api/version.rb) file.
+1. Commit these changes - `Bump version to x.y.z` is an acceptable commit message - and open a PR
+   for review. Your PR should include updates to `lib/conjur-api/version.rb`, and
+    `CHANGELOG.md`.
 
-### Update The Version
+### Add a git tag
 
-- The version file (`lib/conjur-api/version.rb`) has been updated with an appropriate Semantic version number.
-- The `CHANGELOG.md` file has been updated to reflect the release version and appropriate release notes.
+1. Once your changes have been **reviewed and merged into master**, tag the version
+   using `git tag -a "vx.y.z" -m "vx.y.z release"`. Note this requires you to be able to sign releases.
+   Consult the [github documentation on signing commits](https://help.github.com/articles/signing-commits-with-gpg/)
+   on how to set this up. `vx.y.z release` is an acceptable tag message.
+1. Push the tag: `git push vx.y.z` (or `git push origin vx.y.z` if you are working
+   from your local machine).
 
-Next, save -- but do not commit -- the changes above.
-
-### Run The Release Script
-
-```sh
-./bin/release
-```
+After pushing the tag, a matching version will be published to [RubyGems](https://rubygems.org/gems/conjur-api/versions)!

Jenkinsfile

@@ -40,16 +40,11 @@ pipeline {
       }
     }
 
-    // Only publish to RubyGems if branch is 'master'
-    // AND the tag begins with 'v' ex) v5.3.2
+    // Only publish to RubyGems if the tag begins with 'v' ex) v5.3.2
     stage('Publish to RubyGems?') {
-      agent { label 'releaser-v2' }
+      agent { label 'executor-v2' }
 
-      when {
-        allOf {
-          branch 'master'; tag "v*"
-        }
-      }
+      when { tag "v*" }
       steps {
         // Clean up first
         sh 'docker run -i --rm -v $PWD:/src -w /src alpine/git clean -fxd'

lib/conjur-api/version.rb

@@ -19,6 +19,6 @@
 
 module Conjur
   class API
-    VERSION = "5.3.2"
+    VERSION = "5.3.3"
   end
 end