From 6ba4f8a3046010d259758a10aad11bf7c2455d72 Mon Sep 17 00:00:00 2001 From: Dmitry Rybakov Date: Wed, 29 Nov 2023 16:17:19 +0100 Subject: [PATCH] MONGOID-5574 Remove Ruby 2.6 from evergreen (#5763) Co-authored-by: johnnyshields <27655+johnnyshields@users.noreply.github.com> --- .evergreen/config.yml | 21 +++------------------ .evergreen/config/axes.yml.erb | 4 ---- .evergreen/config/variants.yml.erb | 17 +++-------------- 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 1033d970b3..427a539ddc 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -456,10 +456,6 @@ axes: - id: "ruby" display_name: Ruby Version values: - - id: "ruby-2.6" - display_name: ruby-2.6 - variables: - RVM_RUBY: "ruby-2.6" - id: "ruby-2.7" display_name: ruby-2.7 variables: @@ -690,17 +686,6 @@ buildvariants: tasks: - name: "test" -- matrix_name: "ruby-2.6" - matrix_spec: - ruby: ["ruby-2.6"] - driver: ["current"] - topology: ['replica-set'] - mongodb-version: ['4.0'] - os: rhel80 - display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}" - tasks: - - name: "test" - - matrix_name: "driver-upcoming" matrix_spec: driver: [master, stable] @@ -715,7 +700,7 @@ buildvariants: - matrix_name: "driver-oldstable" matrix_spec: driver: [oldstable, min] - ruby: ["ruby-2.6"] + ruby: ["ruby-2.7"] mongodb-version: "4.0" topology: ['replica-set', 'sharded-cluster'] os: rhel80 @@ -726,7 +711,7 @@ buildvariants: - matrix_name: "driver-min" matrix_spec: driver: [min] - ruby: ["ruby-2.6"] + ruby: ["ruby-2.7"] mongodb-version: "3.6" topology: "standalone" os: rhel80 @@ -796,7 +781,7 @@ buildvariants: - matrix_name: "i18n-fallbacks" matrix_spec: - ruby: "ruby-2.6" + ruby: "ruby-2.7" driver: ["current"] mongodb-version: "4.2" topology: "standalone" diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb index 8c8422153b..d3a3c25b54 100644 --- a/.evergreen/config/axes.yml.erb +++ b/.evergreen/config/axes.yml.erb @@ -83,10 +83,6 @@ axes: - id: "ruby" display_name: Ruby Version values: - - id: "ruby-2.6" - display_name: ruby-2.6 - variables: - RVM_RUBY: "ruby-2.6" - id: "ruby-2.7" display_name: ruby-2.7 variables: diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb index 3574b19187..cd7ac6cea4 100644 --- a/.evergreen/config/variants.yml.erb +++ b/.evergreen/config/variants.yml.erb @@ -65,17 +65,6 @@ buildvariants: tasks: - name: "test" -- matrix_name: "ruby-2.6" - matrix_spec: - ruby: ["ruby-2.6"] - driver: ["current"] - topology: ['replica-set'] - mongodb-version: ['4.0'] - os: rhel80 - display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}" - tasks: - - name: "test" - - matrix_name: "driver-upcoming" matrix_spec: driver: [master, stable] @@ -90,7 +79,7 @@ buildvariants: - matrix_name: "driver-oldstable" matrix_spec: driver: [oldstable, min] - ruby: ["ruby-2.6"] + ruby: ["ruby-2.7"] mongodb-version: "4.0" topology: ['replica-set', 'sharded-cluster'] os: rhel80 @@ -101,7 +90,7 @@ buildvariants: - matrix_name: "driver-min" matrix_spec: driver: [min] - ruby: ["ruby-2.6"] + ruby: ["ruby-2.7"] mongodb-version: "3.6" topology: "standalone" os: rhel80 @@ -171,7 +160,7 @@ buildvariants: - matrix_name: "i18n-fallbacks" matrix_spec: - ruby: "ruby-2.6" + ruby: "ruby-2.7" driver: ["current"] mongodb-version: "4.2" topology: "standalone"