Skip to content

Commit acec15a

Browse files
committed
Address review comments
1 parent d1a8766 commit acec15a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ install-dependencies:
110110
parallel:
111111
matrix:
112112
# ADD NEW RUBIES HERE
113+
# TODO: Ruby 3.5 - Not added here yet to avoid increasing SSI OCI image size and adding premature support for 3.5.
113114
- RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
114115
ARCH: ["amd64", "arm64"]
115116
stage: package

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ services:
160160
- bundle-3.4:/usr/local/bundle
161161
- "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
162162
tracer-3.5:
163-
image: ghcr.io/datadog/images-rb/engines/ruby:3.5
163+
image: ghcr.io/datadog/images-rb/engines/ruby:3.5-gnu-gcc
164164
working_dir: /app
165165
command: /bin/bash
166166
depends_on: *common-depends-on

spec/datadog/profiling/collectors/cpu_and_wall_time_worker_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@
684684

685685
it "records allocated objects" do
686686
# TODO: Ruby 3.5 - Remove this skip after investigation.
687-
skip('Allocation profiling call not working correctly on Ruby 3.5.0-preview1') if RUBY_VERSION.start_with?('3.5')
687+
pending('Allocation profiling call not working correctly on Ruby 3.5.0-preview1') if RUBY_DESCRIPTION.include?('preview')
688688

689689
stub_const("CpuAndWallTimeWorkerSpec::TestStruct", Struct.new(:foo))
690690

@@ -885,7 +885,7 @@
885885

886886
it "records live heap objects" do
887887
# TODO: Ruby 3.5 - Remove this skip after investigation.
888-
skip('Heap profiling not working correctly on Ruby 3.5.0-preview1') if RUBY_VERSION.start_with?('3.5')
888+
skip('Heap profiling not working correctly on Ruby 3.5.0-preview1') if RUBY_DESCRIPTION.include?('preview')
889889

890890
stub_const("CpuAndWallTimeWorkerSpec::TestStruct", Struct.new(:foo))
891891

0 commit comments

Comments
 (0)