Skip to content

Commit

Permalink
Merge pull request #206 from cyberark/drop-old-ruby
Browse files Browse the repository at this point in the history
Remove support for Ruby <2.7
  • Loading branch information
szh authored Apr 28, 2022
2 parents dd0f742 + 7abf83d commit 9eda55c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .rubocop_settings.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.5
TargetRubyVersion: 2.7

# These non-default settings best reflect our current code style.
Style/MethodDefParentheses:
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Nothing should go in this section, please add to the latest unreleased version
(and update the corresponding date), or add a new version.

## [5.3.8] - 2022-01-31
## [5.3.8] - 2022-04-26

### Changed
- Remove support for Ruby versions <2.7 which are [end of life](https://endoflife.date/ruby).
[cyberark/conjur-api-ruby#206](https://github.com/cyberark/conjur-api-ruby/pull/206)

## [5.3.7] - 2021-12-28

Expand Down Expand Up @@ -364,7 +368,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.6...HEAD
[Unreleased]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.8...HEAD
[5.3.8]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.7...v5.3.8
[5.3.7]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.6...v5.3.7
[5.3.6]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.5...v5.3.6
[5.3.5]: https://github.com/cyberark/conjur-api-ruby/compare/v5.3.4...v5.3.5
Expand Down
5 changes: 1 addition & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,8 @@ $ docker-compose down
### Update the version and changelog

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`.
for review. Your PR should include updates to `CHANGELOG.md`.

### Add a git tag

Expand Down
34 changes: 0 additions & 34 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,40 +58,6 @@ pipeline {
}
}

stage('Test Ruby 2.5') {
environment {
RUBY_VERSION = '2.5'
}
steps {
sh './test.sh'
}

post {
always {
junit 'spec/reports/*.xml'
junit 'features/reports/*.xml'
junit 'features_v4/reports/*.xml'
}
}
}

stage('Test Ruby 2.6') {
environment {
RUBY_VERSION = '2.6'
}
steps {
sh './test.sh'
}

post {
always {
junit 'spec/reports/*.xml'
junit 'features/reports/*.xml'
junit 'features_v4/reports/*.xml'
}
}
}

stage('Test Ruby 2.7') {
environment {
RUBY_VERSION = '2.7'
Expand Down
2 changes: 1 addition & 1 deletion bin/parse-changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd "$(dirname "$0")"
docker run --rm \
-v "$PWD/..:/work" \
-w "/work" \
ruby:2.5 bash -ec "
ruby:2.7 bash -ec "
gem install -N parse_a_changelog
parse ./CHANGELOG.md
"
Expand Down
2 changes: 1 addition & 1 deletion dev/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5
FROM ruby:2.7

RUN apt-get update && apt-get install -y vim curl

Expand Down

0 comments on commit 9eda55c

Please sign in to comment.