Skip to content

Commit

Permalink
Merge pull request #53 from DataDog/anmarchenko/appraisals_drop_minor…
Browse files Browse the repository at this point in the history 
…_ruby_version

Simplify appraisal gemfiles naming by dropping patch version
  • Loading branch information
@anmarchenko
anmarchenko authored Oct 19, 2023
2 parents 5707183 + 2f53b37 commit 58b2fe6
Show file tree
Hide file tree
Showing 103 changed files with 332 additions and 474 deletions.
4 changes: 3 additions & 1 deletion Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ with_minitest_gem
with_rspec_gem
with_cucumber_gem(versions: 3..8)

ruby_runtime = "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
major, minor, = Gem::Version.new(RUBY_ENGINE_VERSION).segments

ruby_runtime = "#{RUBY_ENGINE}-#{major}.#{minor}"

appraisals.each do |appraisal|
appraisal.name.prepend("#{ruby_runtime}-")
Expand Down
4 changes: 3 additions & 1 deletion Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ namespace :test do
task all: TEST_METADATA.map { |k, _| "test:#{k}" }

ruby_version = RUBY_VERSION[0..2]
ruby_runtime = "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
major, minor, = Gem::Version.new(RUBY_ENGINE_VERSION).segments

ruby_runtime = "#{RUBY_ENGINE}-#{major}.#{minor}"

TEST_METADATA.each do |key, spec_metadata|
spec_task = "spec:#{key}"
Expand Down
20 changes: 4 additions & 16 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ services:
datadog-ci-2.7:
image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.6-dd
command: /bin/bash
depends_on:
- ddagent
env_file: ./.env
environment: &common-environment
BUNDLE_GEMFILE: /app/Gemfile-2.7
Expand All @@ -22,8 +20,6 @@ services:
datadog-ci-3.0:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.4-dd
command: /bin/bash
depends_on:
- ddagent
env_file: ./.env
environment: &common-environment-3x
BUNDLE_GEMFILE: /app/Gemfile-3.0
Expand All @@ -38,8 +34,6 @@ services:
datadog-ci-3.1:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd
command: /bin/bash
depends_on:
- ddagent
env_file: ./.env
environment:
<<: *common-environment-3x
Expand All @@ -54,8 +48,6 @@ services:
datadog-ci-3.2:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
command: /bin/bash
depends_on:
- ddagent
env_file: ./.env
environment:
<<: *common-environment-3x
Expand All @@ -70,8 +62,6 @@ services:
datadog-ci-3.3:
image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
command: /bin/bash
depends_on:
- ddagent
env_file: ./.env
environment:
<<: *common-environment-3x
Expand All @@ -87,8 +77,6 @@ services:
datadog-ci-jruby-9.4:
image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.0.0-dd
command: /bin/bash
depends_on:
- ddagent
env_file: ./.env
environment:
<<: *common-environment
Expand Down Expand Up @@ -120,11 +108,11 @@ volumes:
bundle-3.0:
bundle-3.1:
bundle-3.2:
bundle-3.3:
# ADD NEW RUBIES HERE
bundle-3.3: # ADD NEW RUBIES HERE

bundle-jruby-9.4:
ddagent_var_run:
# Temporary folder used while compiling the profiling native extension. We place this in a volume to avoid the
ddagent_var_run: # Temporary folder used while compiling the profiling native extension. We place this in a volume to avoid the

# massive performance hit (seconds to minutes) that we get when the tmp folder is shared with the host on macOS.
# Hopefully this will be fixed by
# https://www.docker.com/blog/speed-boost-achievement-unlocked-on-docker-desktop-4-6-for-mac/
Expand Down
2 changes: 2 additions & 0 deletions gemfiles/.bundle/config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_RETRY: "1"
0 gemfiles/jruby_9.4.0.0_cucumber_3.gemfile → gemfiles/jruby_9.4_cucumber_3.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...les/jruby_9.4.0.0_cucumber_3.gemfile.lock → gemfiles/jruby_9.4_cucumber_3.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -115,19 +115,19 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
thor (1.2.2)
rubocop-performance (~> 1.19.1)
thor (1.3.0)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
Expand Down
0 gemfiles/jruby_9.4.0.0_cucumber_4.gemfile → gemfiles/jruby_9.4_cucumber_4.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...les/jruby_9.4.0.0_cucumber_4.gemfile.lock → gemfiles/jruby_9.4_cucumber_4.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -142,21 +142,21 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
rubocop-performance (~> 1.19.1)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.2)
thor (1.3.0)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (2.0.6)
Expand Down
0 gemfiles/jruby_9.4.0.0_cucumber_5.gemfile → gemfiles/jruby_9.4_cucumber_5.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...les/jruby_9.4.0.0_cucumber_5.gemfile.lock → gemfiles/jruby_9.4_cucumber_5.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -142,21 +142,21 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
rubocop-performance (~> 1.19.1)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.2)
thor (1.3.0)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (2.0.6)
Expand Down
0 gemfiles/jruby_9.4.0.0_cucumber_6.gemfile → gemfiles/jruby_9.4_cucumber_6.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...les/jruby_9.4.0.0_cucumber_6.gemfile.lock → gemfiles/jruby_9.4_cucumber_6.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -146,21 +146,21 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
rubocop-performance (~> 1.19.1)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.2)
thor (1.3.0)
thread_safe (0.3.6-java)
timecop (0.9.8)
tzinfo (2.0.6)
Expand Down
0 gemfiles/jruby_9.4.0.0_cucumber_7.gemfile → gemfiles/jruby_9.4_cucumber_7.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...les/jruby_9.4.0.0_cucumber_7.gemfile.lock → gemfiles/jruby_9.4_cucumber_7.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -129,21 +129,21 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
rubocop-performance (~> 1.19.1)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.2)
thor (1.3.0)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
Expand Down
0 gemfiles/jruby_9.4.0.0_cucumber_8.gemfile → gemfiles/jruby_9.4_cucumber_8.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...les/jruby_9.4.0.0_cucumber_8.gemfile.lock → gemfiles/jruby_9.4_cucumber_8.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -123,21 +123,21 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
rubocop-performance (~> 1.19.1)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.2.2)
thor (1.3.0)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
Expand Down
0 gemfiles/jruby_9.4.0.0_minitest_5.gemfile → gemfiles/jruby_9.4_minitest_5.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...les/jruby_9.4.0.0_minitest_5.gemfile.lock → gemfiles/jruby_9.4_minitest_5.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -95,19 +95,19 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
thor (1.2.2)
rubocop-performance (~> 1.19.1)
thor (1.3.0)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
Expand Down
0 gemfiles/jruby_9.4.0.0_rspec_3.gemfile → gemfiles/jruby_9.4_rspec_3.gemfile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions gemfiles/jruby_9.4.0.0_rspec_3.gemfile.lock → gemfiles/jruby_9.4_rspec_3.gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ GEM
racc (1.7.1-java)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand Down Expand Up @@ -94,19 +94,19 @@ GEM
simplecov_json_formatter (0.1.4)
spoon (0.0.6)
ffi
standard (1.31.1)
standard (1.31.2)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.2)
rubocop (~> 1.56.4)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.0)
standard-performance (1.2.1)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.0)
thor (1.2.2)
rubocop-performance (~> 1.19.1)
thor (1.3.0)
timecop (0.9.8)
unicode-display_width (2.5.0)
webrick (1.8.1)
Expand Down
22 changes: 0 additions & 22 deletions gemfiles/ruby_2.6.10_cucumber_8.gemfile
View file

This file was deleted.

Loading

0 comments on commit 58b2fe6

Please sign in to comment.