From 9b657fb8b857219743fe8104e23f1431b0e1f778 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Wed, 28 Dec 2022 15:28:18 +0100 Subject: [PATCH] Move to Ruby 3.2.0 final --- .circleci/config.yml | 4 ++-- .../primary/{Dockerfile-3.2.0-preview3 => Dockerfile-3.2.0} | 2 +- .github/workflows/build-ruby.yml | 4 ++-- docker-compose.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename .circleci/images/primary/{Dockerfile-3.2.0-preview3 => Dockerfile-3.2.0} (98%) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1025dfa5e7..1b6ff7079b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -529,8 +529,8 @@ job_configuration: resource_class_to_use: medium+ - &config-3_2 <<: *filters_all_branches_and_tags - ruby_version: 'ruby-3.2.0-preview3' - image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-preview3-dd + ruby_version: 'ruby-3.2.0' + image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd resource_class_to_use: medium+ # ADD NEW RUBIES HERE - &config-jruby-9_2_8_0 # Test with older 9.2 release because 9.2.9.0 changed behavior, see https://github.com/DataDog/dd-trace-rb/pull/1409 diff --git a/.circleci/images/primary/Dockerfile-3.2.0-preview3 b/.circleci/images/primary/Dockerfile-3.2.0 similarity index 98% rename from .circleci/images/primary/Dockerfile-3.2.0-preview3 rename to .circleci/images/primary/Dockerfile-3.2.0 index 46c82a58aeb..2284aa2b58a 100644 --- a/.circleci/images/primary/Dockerfile-3.2.0-preview3 +++ b/.circleci/images/primary/Dockerfile-3.2.0 @@ -1,4 +1,4 @@ -FROM ruby:3.2.0-preview3-bullseye +FROM ruby:3.2.0-bullseye # Make apt non-interactive RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \ diff --git a/.github/workflows/build-ruby.yml b/.github/workflows/build-ruby.yml index 36dce04bb9e..ee3a4547c41 100644 --- a/.github/workflows/build-ruby.yml +++ b/.github/workflows/build-ruby.yml @@ -49,8 +49,8 @@ jobs: version: 3.1.2 dockerfile: Dockerfile-3.1.2 - engine: ruby - version: 3.2.0-preview3 - dockerfile: Dockerfile-3.2.0-preview3 + version: 3.2.0 + dockerfile: Dockerfile-3.2.0 - engine: jruby version: 9.2.21.0 dockerfile: Dockerfile-jruby-9.2.21.0 diff --git a/docker-compose.yml b/docker-compose.yml index 759ca6ea496..7b1e884d915 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -225,7 +225,7 @@ services: - bundle-3.1:/usr/local/bundle - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}" tracer-3.2: - image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-preview3-dd + image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd command: /bin/bash depends_on: - ddagent