ci: update test images to use 3.3 final

sparklemotion · Dec 27, 2023 · 76f96ad · 76f96ad
1 parent 84afa8c
commit 76f96ad
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/generate-ci-images.yml b/.github/workflows/generate-ci-images.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tag: ["alpine", "mri-3.0", "mri-3.1", "mri-3.2", "mri-3.3-rc", "truffle-nightly", "ubuntu"]
+        tag: ["alpine", "mri-3.0", "mri-3.1", "mri-3.2", "mri-3.3", "truffle-nightly", "ubuntu"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

diff --git a/...mages/nokogiri-test/mri-3.3-rc.dockerfile → oci-images/nokogiri-test/mri-3.3.dockerfile b/...mages/nokogiri-test/mri-3.3-rc.dockerfile → oci-images/nokogiri-test/mri-3.3.dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3-rc
+FROM ruby:3.3
 
 # include_file debian-prelude.step
 # -*- dockerfile -*-
@@ -9,10 +9,16 @@ RUN apt-get upgrade -y
 RUN apt-get install -y apt-utils
 
 
-# include_file debian-valgrind.step
+# include_file valgrind-from-source.step
 # -*- dockerfile -*-
 
-RUN apt-get install -y valgrind
+RUN apt-get install -y libc6-dbg
+RUN wget https://sourceware.org/pub/valgrind/valgrind-3.21.0.tar.bz2 && \
+    tar -xf valgrind-3.21.0.tar.bz2 && \
+    cd valgrind-3.21.0 && \
+    ./configure && \
+    make && \
+    make install
 
 
 # include_file debian-libxml-et-al.step

diff --git a/oci-images/nokogiri-test/mri.erb b/oci-images/nokogiri-test/mri.erb
@@ -2,7 +2,7 @@ FROM ruby:<%= version %>
 
 <%= include_file "debian-prelude.step" %>
 
-<% if version == "3.2" -%>
+<% if version >= "3.2" -%>
 <%= include_file "valgrind-from-source.step" %>
 <% else -%>
 <%= include_file "debian-valgrind.step" %>

diff --git a/rakelib/docker.rake b/rakelib/docker.rake
@@ -8,7 +8,7 @@ module DockerHelper
   IMAGE_DIR = "oci-images/nokogiri-test"
   IMAGE_NAME = "ghcr.io/sparklemotion/nokogiri-test"
   RUBIES = {
-    mri: ["3.0", "3.1", "3.2", "3.3-rc"],
+    mri: ["3.0", "3.1", "3.2", "3.3"],
     truffle: ["nightly"],
   }
 
@@ -74,14 +74,14 @@ module DockerHelper
                   ruby-version: "3.1"
                   bundler-cache: true
                   bundler: latest
-              - uses: docker/setup-buildx-action@v2
-              - uses: docker/login-action@v2
+              - uses: docker/setup-buildx-action@v3
+              - uses: docker/login-action@v3
                 with:
                   registry: ghcr.io
                   username: ${{github.actor}}
                   password: ${{secrets.GITHUB_TOKEN}}
               - name: ${{matrix.tag}}
-                uses: docker/build-push-action@v3
+                uses: docker/build-push-action@v5
                 with:
                   context: "."
                   push: true