Merge branch 'main' into patch-1

.github/workflows/ci.yml

@@ -17,14 +17,11 @@ jobs:
       matrix:
         mysql: ["5.7", "8"]
         distribution: ["debian:buster", "ubuntu:focal", "ubuntu:bionic"]
-        ruby: ["3.2"]
+        ruby: ["3.3"]
         include:
           - mysql: "5.7"
             distribution: "debian:buster"
-            ruby: "1.9"
-          - mysql: "5.7"
-            distribution: "debian:buster"
-            ruby: "2.8"
+            ruby: "2.7.8"
     steps:
     - uses: actions/checkout@v4
     - name: docker login

Dockerfile

@@ -1,5 +1,4 @@
 ARG DISTRIBUTION=ubuntu:jammy
-ARG RUBY_VERSION=3.2
 FROM ${DISTRIBUTION}
 LABEL maintainer="github@github.com"
 
@@ -10,9 +9,10 @@ RUN update-ca-certificates
 RUN wget https://github.com/postmodern/ruby-install/releases/download/v0.9.0/ruby-install-0.9.0.tar.gz && \
     tar -xzvf ruby-install-0.9.0.tar.gz && \
     cd ruby-install-0.9.0/ && \
-    make install && \
-    ruby-install --system ruby ${RUBY_VERSION}
+    make install
 
+ARG RUBY_VERSION=3.2
+RUN ruby-install --system ruby ${RUBY_VERSION}
 RUN ruby --version
 
 WORKDIR /app

contrib/ruby/script/bootstrap

@@ -3,8 +3,9 @@
 set -e
 cd "$(dirname $0)"/..
 
-bundle check --path vendor/gems 2>&1 > /dev/null || {
-  bundle install --path vendor/gems "$@"
+bundle config set --local path vendor/gems
+bundle check 2>&1 > /dev/null || {
+  bundle install "$@"
   bundle clean
 }