Skip to content

Commit c06d9f6

Browse files
authored
Merge branch 'main' into jb/enable-ruby-3-4
2 parents 93d2e8f + f5d6337 commit c06d9f6

File tree

9 files changed

+32
-42
lines changed

9 files changed

+32
-42
lines changed

.github/workflows/build-gem.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,15 @@ jobs:
2222
BUILD_PLATFORM: ${{ startsWith(inputs.version, 'jruby') && 'jruby' || 'ruby' }}
2323
FLAKY: ${{ startsWith(inputs.version, 'jruby') && 'true' || 'false' }}
2424

25-
services:
26-
redis:
27-
image: redis
28-
ports:
29-
- 6379:6379
30-
dynamodb:
31-
image: amazon/dynamodb-local
32-
ports:
33-
- 8000:8000
34-
consul:
35-
image: hashicorp/consul
36-
ports:
37-
- 8500:8500
38-
3925
steps:
4026
- uses: actions/checkout@v4
4127

28+
- uses: launchdarkly/gh-actions/actions/persistent-stores@persistent-stores-v0
29+
with:
30+
redis: true
31+
consul: true
32+
dynamodb: true
33+
4234
- uses: ./.github/actions/setup
4335
with:
4436
version: ${{ inputs.version }}

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
build-linux:
1414
uses: ./.github/workflows/build-gem.yml
1515
strategy:
16+
fail-fast: false
1617
matrix:
1718
version: ["3.2", "3.4", "jruby-9.4"]
1819
with:

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "8.11.0"
2+
".": "8.11.1"
33
}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to the LaunchDarkly Ruby SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
44

5+
## [8.11.1](https://github.com/launchdarkly/ruby-server-sdk/compare/8.11.0...8.11.1) (2025-10-10)
6+
7+
8+
### Bug Fixes
9+
10+
* Explicitly require openssl gem ([#334](https://github.com/launchdarkly/ruby-server-sdk/issues/334)) ([0ea53a5](https://github.com/launchdarkly/ruby-server-sdk/commit/0ea53a5826968e9da094792217e69c17fa7edc18)), closes [#333](https://github.com/launchdarkly/ruby-server-sdk/issues/333)
11+
512
## [8.11.0](https://github.com/launchdarkly/ruby-server-sdk/compare/8.10.2...8.11.0) (2025-07-15)
613

714

PROVENANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To verify SLSA provenance attestations, we recommend using [slsa-verifier](https
99
<!-- x-release-please-start-version -->
1010
```
1111
# Set the version of the SDK to verify
12-
SDK_VERSION=8.11.0
12+
SDK_VERSION=8.11.1
1313
```
1414
<!-- x-release-please-end -->
1515

launchdarkly-server-sdk.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
4040
spec.add_runtime_dependency "concurrent-ruby", "~> 1.1"
4141
spec.add_runtime_dependency "ld-eventsource", "2.2.6"
4242
spec.add_runtime_dependency "observer", "~> 0.1.2"
43+
spec.add_runtime_dependency "openssl", "~> 3.1", ">= 3.1.2"
4344
spec.add_runtime_dependency "semantic", "~> 1.6"
4445
spec.add_runtime_dependency "zlib", "~> 3.1" unless RUBY_PLATFORM == "java"
4546
# Please keep ld-eventsource dependency as an exact version so that bugfixes to

lib/ldclient-rb/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module LaunchDarkly
2-
VERSION = "8.11.0" # x-release-please-version
2+
VERSION = "8.11.1" # x-release-please-version
33
end

spec/http_util.rb

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,25 @@
77
class StubHTTPServer
88
attr_reader :requests, :port
99

10-
@@next_port = 50000
11-
1210
def initialize(enable_compression: false)
13-
@port = StubHTTPServer.next_port
1411
@enable_compression = enable_compression
15-
begin
16-
base_opts = {
17-
BindAddress: '127.0.0.1',
18-
Port: @port,
19-
AccessLog: [],
20-
Logger: NullLogger.new,
21-
RequestCallback: method(:record_request),
22-
}
23-
@server = create_server(@port, base_opts)
24-
rescue Errno::EADDRINUSE
25-
@port = StubHTTPServer.next_port
26-
retry
27-
end
12+
base_opts = {
13+
BindAddress: '127.0.0.1',
14+
Port: 0, # Let OS assign an available port
15+
AccessLog: [],
16+
Logger: NullLogger.new,
17+
RequestCallback: method(:record_request),
18+
}
19+
@server = create_server(base_opts)
2820
@requests = []
2921
@requests_queue = Queue.new
3022
end
3123

32-
def self.next_port
33-
p = @@next_port
34-
@@next_port = (p + 1 < 60000) ? p + 1 : 50000
35-
p
36-
end
37-
38-
def create_server(port, base_opts)
39-
WEBrick::HTTPServer.new(base_opts)
24+
def create_server(base_opts)
25+
server = WEBrick::HTTPServer.new(base_opts)
26+
# Get the actual port assigned by the OS
27+
@port = server.config[:Port]
28+
server
4029
end
4130

4231
def start

spec/ldclient_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ module LaunchDarkly
113113
prereq = flags_map[prereq[:key].to_sym]
114114
prereq_index = flags_list.index(prereq)
115115
if prereq_index > item_index
116-
all_keys = (flags_list.map { |f| f[:key] }).join(", ")
116+
all_keys = flags_list.map { |f| f[:key] }.join(", ")
117117
raise "#{item[:key]} depends on #{prereq[:key]}, but #{item[:key]} was listed first; keys in order are [#{all_keys}]"
118118
end
119119
end

0 commit comments

Comments
 (0)