From 5eec272b76bfa7c396d54dc38d2ec6e5ee2512a2 Mon Sep 17 00:00:00 2001
From: Kevin McCormack <kevin@mccormack.tech>
Date: Mon, 28 Oct 2024 21:39:46 -0400
Subject: [PATCH 1/5] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b035e809..0cacf25b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,4 +30,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run tests with Ruby ${{ matrix.ruby }}
-      run: docker-compose run ci-${{ matrix.ruby }}
+      run: docker compose run ci-${{ matrix.ruby }}

From 60f2bc35dbc58b7b1ab0e6bdde14b02c300f3e34 Mon Sep 17 00:00:00 2001
From: Kevin McCormack <kevin@mccormack.tech>
Date: Mon, 28 Oct 2024 21:43:43 -0400
Subject: [PATCH 2/5] Update docker-compose

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6ada67bf..46ef00cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 networks:
   integration_test_network:
 

From 16ebec42a8c99777ae3e1adf9016ac90109d1c9f Mon Sep 17 00:00:00 2001
From: Kevin McCormack <kevin@mccormack.tech>
Date: Mon, 28 Oct 2024 21:46:20 -0400
Subject: [PATCH 3/5] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0cacf25b..945d1787 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
           - "3.2"
           - "jruby-9.3"
           - "jruby-9.4"
-          - "truffleruby-22"
+          - "truffleruby-24"
     steps:
     - uses: actions/checkout@v2
     - name: Run tests with Ruby ${{ matrix.ruby }}

From 8a737ce0fdefaeba97c171f1ced021766607fea5 Mon Sep 17 00:00:00 2001
From: Kevin McCormack <kevin@mccormack.tech>
Date: Mon, 28 Oct 2024 21:49:37 -0400
Subject: [PATCH 4/5] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 docker-compose.yml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 945d1787..6f335bc0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
           - "3.2"
           - "jruby-9.3"
           - "jruby-9.4"
-          - "truffleruby-24"
+          - "truffleruby"
     steps:
     - uses: actions/checkout@v2
     - name: Run tests with Ruby ${{ matrix.ruby }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 46ef00cf..ea9d5865 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -93,8 +93,8 @@ services:
     working_dir: /code
 
   # https://github.com/flavorjones/truffleruby/pkgs/container/truffleruby
-  ci-truffleruby-22:
-    image: ghcr.io/flavorjones/truffleruby:22.3.1
+  ci-truffleruby:
+    image: ghcr.io/flavorjones/truffleruby:stable
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap

From ed83108ea1bb549a76bab1e8e48995ae8306614b Mon Sep 17 00:00:00 2001
From: Kevin McCormack <kevin@mccormack.tech>
Date: Mon, 28 Oct 2024 21:53:02 -0400
Subject: [PATCH 5/5] Update test.yml

---
 .github/workflows/test.yml |  3 +--
 docker-compose.yml         | 30 ++++++++----------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6f335bc0..3a405a39 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,11 +19,10 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "2.6"
-          - "2.7"
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
           - "jruby-9.3"
           - "jruby-9.4"
           - "truffleruby"
diff --git a/docker-compose.yml b/docker-compose.yml
index ea9d5865..11f93ba2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,22 +22,8 @@ services:
     volumes:
       - ./test/fixtures/ldif:/ldif:ro
 
-  ci-2.6:
-    image: ruby:2.7
-    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-2.7:
-    image: ruby:2.7
+  ci-3.0:
+    image: ruby:3.0
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -50,8 +36,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
@@ -64,8 +50,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-3.1:
-    image: ruby:3.1
+  ci-3.2:
+    image: ruby:3.2
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -78,8 +64,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-3.2:
-    image: ruby:3.2
+  ci-3.3:
+    image: ruby:3.3
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap