Skip to content

Commit

Permalink
Merge branch 'psych-fix' into test-psych
Browse files Browse the repository at this point in the history
* psych-fix:
  Attempt to fix psych test flakiness
  DEBUG-2334 respect maxFieldCount in probe specification (#4142)
  Revert "Run the cucumber test in unbundled environment" (#4143)
  Update guard rails and doc (Excluding 3.4 installation)
  Lower declared requirements
  Use CentOS 7 images for SSI
  DEBUG-2334 require ostruct for OpenStruct dependency (#4135)
  DEBUG-2334 Set duration to 0 for DI line probes (#4134)
  • Loading branch information
p committed Nov 21, 2024
2 parents bcb1698 + e74e47c commit 35e299d
Show file tree
Hide file tree
Showing 29 changed files with 327 additions and 458 deletions.
7 changes: 4 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ default:
parallel:
matrix:
# ADD NEW RUBIES HERE
- RUBY_VERSION: ["3.2.2", "3.1.4", "3.0.6", "2.7.8"]
- RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
script:
- >
docker build
Expand Down Expand Up @@ -60,7 +60,7 @@ promote-image:
parallel:
matrix:
# ADD NEW RUBIES HERE
- RUBY_VERSION: ["3.2.2", "3.1.4", "3.0.6", "2.7.8"]
- RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
ARCHITECTURE: ["amd64", "arm64"]
script:
- docker pull $RUBY_CUSTOM_IMAGE_BASE/$RUBY_VERSION-$ARCHITECTURE:$CI_PIPELINE_ID
Expand Down Expand Up @@ -92,7 +92,8 @@ install-dependencies:
tags: [ "arch:$ARCH" ]
parallel:
matrix:
- RUBY_VERSION: ["2.7.8", "3.0.6", "3.1.4", "3.2.2"]
# Promote again when adding 3.4 support
- RUBY_VERSION: ["3.3", "3.2", "3.1", "3.0", "2.7"]
ARCH: [ "amd64", "arm64" ]
stage: package
needs:
Expand Down
1 change: 1 addition & 0 deletions .gitlab/Dockerfile-2.7
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM ghcr.io/datadog/images-rb/engines/ruby:2.7-centos-gcc
94 changes: 0 additions & 94 deletions .gitlab/Dockerfile-2.7.8

This file was deleted.

1 change: 1 addition & 0 deletions .gitlab/Dockerfile-3.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM ghcr.io/datadog/images-rb/engines/ruby:3.0-centos-gcc
94 changes: 0 additions & 94 deletions .gitlab/Dockerfile-3.0.6

This file was deleted.

1 change: 1 addition & 0 deletions .gitlab/Dockerfile-3.1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM ghcr.io/datadog/images-rb/engines/ruby:3.1-centos-gcc
94 changes: 0 additions & 94 deletions .gitlab/Dockerfile-3.1.4

This file was deleted.

1 change: 1 addition & 0 deletions .gitlab/Dockerfile-3.2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM ghcr.io/datadog/images-rb/engines/ruby:3.2-centos-gcc
Loading

0 comments on commit 35e299d

Please sign in to comment.