Skip to content

Commit 0319905

Browse files
authored
chore: Fix CI and build (#325)
1 parent 893bb66 commit 0319905

File tree

9 files changed

+22
-23
lines changed

9 files changed

+22
-23
lines changed

.github/actions/check/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919

2020
- name: Run tests
2121
shell: bash
22-
run: bundle _2.2.33_ exec rspec spec $SPEC_TAGS
22+
run: bundle exec rspec spec $SPEC_TAGS
2323

2424
- name: Run RuboCop
2525
shell: bash

.github/actions/setup/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ runs:
1515
- uses: ruby/setup-ruby@v1
1616
with:
1717
ruby-version: ${{ inputs.version }}
18-
bundler: 2.2.33
1918

2019
- name: Install dependencies
2120
if: ${{ inputs.install-dependencies == 'true' }}
2221
shell: bash
23-
run: bundle _2.2.33_ install
22+
run: bundle install

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
version: '3.0'
5656

5757
- name: Run tests
58-
run: bundle _2.2.33_ exec rspec spec
58+
run: bundle exec rspec spec

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require:
1+
plugins:
22
- rubocop-performance
33

44
AllCops:
@@ -289,7 +289,7 @@ Style/PerlBackrefs:
289289
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
290290
Enabled: false
291291

292-
Naming/PredicateName:
292+
Naming/PredicatePrefix:
293293
Description: 'Check the names of predicate methods.'
294294
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark'
295295
ForbiddenPrefixes:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ TEMP_TEST_OUTPUT=/tmp/contract-test-service.log
55
TEST_HARNESS_PARAMS=
66

77
build-contract-tests:
8-
@cd contract-tests && bundle _2.2.33_ install
8+
@cd contract-tests && bundle install
99

1010
start-contract-test-service:
11-
@cd contract-tests && bundle _2.2.33_ exec ruby service.rb
11+
@cd contract-tests && bundle exec ruby service.rb
1212

1313
start-contract-test-service-bg:
1414
@echo "Test service output will be captured in $(TEMP_TEST_OUTPUT)"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LaunchDarkly overview
1616
Supported Ruby versions
1717
-----------------------
1818

19-
This version of the LaunchDarkly SDK has a minimum Ruby version of 2.5.0, or 9.2.0 for JRuby.
19+
This version of the LaunchDarkly SDK has a minimum Ruby version of 3.0.0, or 9.3.0 for JRuby.
2020

2121
Getting started
2222
-----------

launchdarkly-server-sdk.gemspec

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ Gem::Specification.new do |spec|
2121
spec.required_ruby_version = ">= 3.0.0"
2222

2323
spec.add_development_dependency "aws-sdk-dynamodb", "~> 1.57"
24-
spec.add_development_dependency "rexml", "~> 3.3", ">= 3.3.7"
25-
spec.add_development_dependency "bundler", "2.2.33"
26-
spec.add_development_dependency "simplecov", "~> 0.21"
27-
spec.add_development_dependency "rspec", "~> 3.10"
24+
spec.add_development_dependency "bundler", "~> 2.2", ">= 2.2.3"
25+
spec.add_development_dependency "connection_pool", "~> 2.3"
2826
spec.add_development_dependency "diplomat", "~> 2.6"
27+
spec.add_development_dependency "listen", "~> 3.3" # see file_data_source.rb
2928
spec.add_development_dependency "redis", "~> 5.0"
30-
spec.add_development_dependency "connection_pool", "~> 2.3"
29+
spec.add_development_dependency "rexml", "~> 3.3", ">= 3.3.7"
30+
spec.add_development_dependency "rspec", "~> 3.10"
3131
spec.add_development_dependency "rspec_junit_formatter", "~> 0.4"
32+
spec.add_development_dependency "rubocop", "~> 1.76"
33+
spec.add_development_dependency "rubocop-performance", "~> 1.25"
34+
spec.add_development_dependency "simplecov", "~> 0.21"
3235
spec.add_development_dependency "timecop", "~> 0.9"
33-
spec.add_development_dependency "listen", "~> 3.3" # see file_data_source.rb
3436
spec.add_development_dependency "webrick", "~> 1.7"
35-
spec.add_development_dependency "rubocop", "~> 1.37"
36-
spec.add_development_dependency "rubocop-performance", "~> 1.15"
3737

38-
spec.add_runtime_dependency "semantic", "~> 1.6"
3938
spec.add_runtime_dependency "concurrent-ruby", "~> 1.1"
4039
spec.add_runtime_dependency "ld-eventsource", "2.2.3"
4140
spec.add_runtime_dependency "observer", "~> 0.1.2"
41+
spec.add_runtime_dependency "semantic", "~> 1.6"
4242
spec.add_runtime_dependency "zlib", "~> 3.1" unless RUBY_PLATFORM == "java"
4343
# Please keep ld-eventsource dependency as an exact version so that bugfixes to
4444
# that LD library are always associated with a new SDK version.
4545

46-
spec.add_runtime_dependency "json", "~> 2.3"
4746
spec.add_runtime_dependency "http", ">= 4.4.0", "< 6.0.0"
47+
spec.add_runtime_dependency "json", "~> 2.3"
4848
end

spec/impl/repeating_task_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def null_logger
3838
3.times do
3939
time = queue.pop
4040
unless last.nil?
41-
expect(time.to_f - last.to_f).to be >=(0.05)
41+
expect(time.to_f - last.to_f).to be >= 0.05
4242
end
4343
last = time
4444
end
@@ -50,7 +50,7 @@ def null_logger
5050
2.times do
5151
begin
5252
time = queue.pop(true)
53-
expect(time.to_f).to be <=(stopped_time.to_f)
53+
expect(time.to_f).to be <= stopped_time.to_f
5454
rescue ThreadError
5555
no_more_items = true
5656
break

spec/launchdarkly-server-sdk_spec_autoloadtest.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
require "bundler/setup"
21
require "bundler/inline"
32

43
gemfile do
5-
gem "launchdarkly-server-sdk", path: "."
4+
# Inline gemfiles don't appear to load the gemspec so we are loading it explicitly
5+
gemspec
66
end
77

88
Bundler.require(:development)

0 commit comments

Comments
 (0)