From 3ae97241363063089f0f2971f5177b027d31396f Mon Sep 17 00:00:00 2001
From: Kevin McCormack <kevin@mccormack.tech>
Date: Wed, 29 Mar 2023 09:43:11 -0400
Subject: [PATCH] Drop Ruby 2.5 and JRuby 9.2 from CI tests

---
 .github/workflows/test.yml |  6 +++--
 History.rdoc               |  1 +
 docker-compose.yml         | 48 ++++++++++++++++++++++++++++++--------
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15ea9c83..f0ad168b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,11 +19,13 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "2.5"
           - "2.6"
           - "2.7"
           - "3.0"
-          - "jruby-9.2"
+          - "3.1"
+          - "3.2"
+          - "jruby-9.3"
+          - "jruby-9.4"
           - "truffleruby-21.0.0"
     steps:
     - uses: actions/checkout@v2
diff --git a/History.rdoc b/History.rdoc
index 14d14ebe..36d55f2c 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,6 +1,7 @@
 === Net::LDAP 0.18.0
 * Fix escaping of # and space in attrs #408
 * Add support to use SNI #406
+* Drop Ruby 2.5 and JRuby 9.2 from CI tests
 
 === Net::LDAP 0.17.1
 * Fixed shebang of bash #385
diff --git a/docker-compose.yml b/docker-compose.yml
index 88a1cfd9..60f36a8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,8 +24,8 @@ services:
     volumes:
       - ./test/fixtures/ldif:/ldif:ro
 
-  ci-2.5:
-    image: ruby:2.5
+  ci-2.6:
+    image: ruby:2.7
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -38,7 +38,7 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-2.6:
+  ci-2.7:
     image: ruby:2.7
     entrypoint: /code/ci-run.sh
     environment:
@@ -52,8 +52,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-2.7:
-    image: ruby:2.7
+  ci-3.0:
+    image: ruby:3.0
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -66,8 +66,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-3.0:
-    image: ruby:3.0
+  ci-3.1:
+    image: ruby:3.1
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -79,7 +79,21 @@ services:
     volumes:
       - .:/code
     working_dir: /code
-  
+
+  ci-3.2:
+    image: ruby:3.2
+    entrypoint: /code/ci-run.sh
+    environment:
+      INTEGRATION: openldap
+      INTEGRATION_HOST: ldap.example.org
+    depends_on:
+      - openldap
+    networks:
+      integration_test_network:
+    volumes:
+      - .:/code
+    working_dir: /code
+
   ci-truffleruby-21.0.0:
     image: flavorjones/truffleruby:21.0.0
     entrypoint: /code/ci-run.sh
@@ -94,8 +108,22 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-jruby-9.2:
-    image: jruby:9.2
+  ci-jruby-9.3:
+    image: jruby:9.3
+    entrypoint: /code/ci-run.sh
+    environment:
+      INTEGRATION: openldap
+      INTEGRATION_HOST: ldap.example.org
+    depends_on:
+      - openldap
+    networks:
+      integration_test_network:
+    volumes:
+      - .:/code
+    working_dir: /code
+
+  ci-jruby-9.4:
+    image: jruby:9.4
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap