fix: respect variant_exclusions in contributor CI workflow

Use variants_for_ruby_version(rpv) instead of raw variants to skip
malloctrim for Ruby >= 3.3, consistent with the main CI workflow.

Author: abtreece

.github/workflows/ci-cd-contributor.yml

@@ -147,7 +147,7 @@ jobs:
       ### Download sources ###
 
       - name: Download Ruby source
-        run: curl -fsSL -o ruby-src.tar.gz 'https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.gz'
+        run: curl -fsSL -o ruby-src.tar.gz 'https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.gz'
       - name: Download Jemalloc source
         run: curl -fsSL -o jemalloc-src.tar.bz2 'https://github.com/jemalloc/jemalloc/releases/download/3.6.0/jemalloc-3.6.0.tar.bz2'
       - name: Clone Rbenv source
@@ -181,7 +181,7 @@ jobs:
           ./build-ruby \
             -n 'ubuntu-24.04' \
             -s "$(pwd)/ruby-src.tar.gz" \
-            -v '3.4' \
+            -v '4.0' \
             -o "$(pwd)/ruby-bin-ubuntu-24.04-normal.tar.gz" \
             -j 2
 
@@ -190,27 +190,17 @@ jobs:
           ./build-ruby \
             -n 'ubuntu-24.04' \
             -s "$(pwd)/ruby-src.tar.gz" \
-            -v '3.4' \
+            -v '4.0' \
             -o "$(pwd)/ruby-bin-ubuntu-24.04-jemalloc.tar.gz" \
             -m "$(pwd)/jemalloc-bin-ubuntu-24.04.tar.gz" \
             -j 2
 
-      - name: 'Build Ruby binaries [ubuntu-24.04/malloctrim]'
-        run: |
-          ./build-ruby \
-            -n 'ubuntu-24.04' \
-            -s "$(pwd)/ruby-src.tar.gz" \
-            -v '3.4' \
-            -o "$(pwd)/ruby-bin-ubuntu-24.04-malloctrim.tar.gz" \
-            -t \
-            -j 2
-
       - name: 'Build Ruby binaries [el-9/normal]'
         run: |
           ./build-ruby \
             -n 'el-9' \
             -s "$(pwd)/ruby-src.tar.gz" \
-            -v '3.4' \
+            -v '4.0' \
             -o "$(pwd)/ruby-bin-el-9-normal.tar.gz" \
             -j 2
 
@@ -219,21 +209,11 @@ jobs:
           ./build-ruby \
             -n 'el-9' \
             -s "$(pwd)/ruby-src.tar.gz" \
-            -v '3.4' \
+            -v '4.0' \
             -o "$(pwd)/ruby-bin-el-9-jemalloc.tar.gz" \
             -m "$(pwd)/jemalloc-bin-el-9.tar.gz" \
             -j 2
 
-      - name: 'Build Ruby binaries [el-9/malloctrim]'
-        run: |
-          ./build-ruby \
-            -n 'el-9' \
-            -s "$(pwd)/ruby-src.tar.gz" \
-            -v '3.4' \
-            -o "$(pwd)/ruby-bin-el-9-malloctrim.tar.gz" \
-            -t \
-            -j 2
-
       - name: Create packages directory
         run: mkdir -p packages
 
@@ -243,43 +223,29 @@ jobs:
         run: |
           ./build-ruby-deb \
             -b "$(pwd)/ruby-bin-ubuntu-24.04-normal.tar.gz" \
-            -o "$(pwd)/packages/fullstaq-ruby-3.4_7-ubuntu-24.04_amd64.deb" \
-            -r '7'
+            -o "$(pwd)/packages/fullstaq-ruby-4.0_2-ubuntu-24.04_amd64.deb" \
+            -r '2'
 
       - name: 'Build Ruby package [ubuntu-24.04/jemalloc]'
         run: |
           ./build-ruby-deb \
             -b "$(pwd)/ruby-bin-ubuntu-24.04-jemalloc.tar.gz" \
-            -o "$(pwd)/packages/fullstaq-ruby-3.4-jemalloc_7-ubuntu-24.04_amd64.deb" \
-            -r '7'
-
-      - name: 'Build Ruby package [ubuntu-24.04/malloctrim]'
-        run: |
-          ./build-ruby-deb \
-            -b "$(pwd)/ruby-bin-ubuntu-24.04-malloctrim.tar.gz" \
-            -o "$(pwd)/packages/fullstaq-ruby-3.4-malloctrim_7-ubuntu-24.04_amd64.deb" \
-            -r '7'
+            -o "$(pwd)/packages/fullstaq-ruby-4.0-jemalloc_2-ubuntu-24.04_amd64.deb" \
+            -r '2'
 
       - name: 'Build Ruby package [el-9/normal]'
         run: |
           ./build-ruby-rpm \
             -b "$(pwd)/ruby-bin-el-9-normal.tar.gz" \
-            -o "$(pwd)/packages/fullstaq-ruby-3.4-rev7-el9.x86_64.rpm" \
-            -r '7'
+            -o "$(pwd)/packages/fullstaq-ruby-4.0-rev2-el9.x86_64.rpm" \
+            -r '2'
 
       - name: 'Build Ruby package [el-9/jemalloc]'
         run: |
           ./build-ruby-rpm \
             -b "$(pwd)/ruby-bin-el-9-jemalloc.tar.gz" \
-            -o "$(pwd)/packages/fullstaq-ruby-3.4-jemalloc-rev7-el9.x86_64.rpm" \
-            -r '7'
-
-      - name: 'Build Ruby package [el-9/malloctrim]'
-        run: |
-          ./build-ruby-rpm \
-            -b "$(pwd)/ruby-bin-el-9-malloctrim.tar.gz" \
-            -o "$(pwd)/packages/fullstaq-ruby-3.4-malloctrim-rev7-el9.x86_64.rpm" \
-            -r '7'
+            -o "$(pwd)/packages/fullstaq-ruby-4.0-jemalloc-rev2-el9.x86_64.rpm" \
+            -r '2'
 
       ### Build Rbenv packages ###
 
@@ -336,10 +302,6 @@ jobs:
             variant: 'jemalloc'
             test_image: 'ubuntu:24.04'
             package_format: 'DEB'
-          - distro: 'ubuntu-24.04'
-            variant: 'malloctrim'
-            test_image: 'ubuntu:24.04'
-            package_format: 'DEB'
           - distro: 'el-9'
             variant: 'normal'
             test_image: 'rockylinux:9'
@@ -348,10 +310,6 @@ jobs:
             variant: 'jemalloc'
             test_image: 'rockylinux:9'
             package_format: 'RPM'
-          - distro: 'el-9'
-            variant: 'malloctrim'
-            test_image: 'rockylinux:9'
-            package_format: 'RPM'
     steps:
       - uses: actions/checkout@v4
 
@@ -383,10 +341,10 @@ jobs:
             VARIANT_SUFFIX="-${VARIANT}"
           fi
           if [ "$FORMAT" = "DEB" ]; then
-            FILENAME="fullstaq-ruby-3.4${VARIANT_SUFFIX}_7-${DISTRO}_amd64.deb"
+            FILENAME="fullstaq-ruby-4.0${VARIANT_SUFFIX}_2-${DISTRO}_amd64.deb"
           else
             SANITIZED_DISTRO=$(echo "$DISTRO" | tr -d '-')
-            FILENAME="fullstaq-ruby-3.4${VARIANT_SUFFIX}-rev7-${SANITIZED_DISTRO}.x86_64.rpm"
+            FILENAME="fullstaq-ruby-4.0${VARIANT_SUFFIX}-rev2-${SANITIZED_DISTRO}.x86_64.rpm"
           fi
           echo "filename=${FILENAME}" >> "$GITHUB_OUTPUT"
 

.github/workflows/ci-cd-contributor.yml.erb

@@ -139,7 +139,7 @@ jobs:
       ### Build Ruby binaries ###
 
       <%- contributor_distributions.each do |distro| -%>
-      <%- variants.each do |variant| -%>
+      <%- variants_for_ruby_version(rpv).each do |variant| -%>
       - name: 'Build Ruby binaries [<%= distro[:name] %>/<%= variant[:name] %>]'
         run: |
           ./build-ruby \
@@ -162,7 +162,7 @@ jobs:
       ### Build Ruby packages ###
 
       <%- contributor_distributions.each do |distro| -%>
-      <%- variants.each do |variant| -%>
+      <%- variants_for_ruby_version(rpv).each do |variant| -%>
       <%- pkg_basename = ruby_package_basename(rpv, distro, variant) -%>
       - name: 'Build Ruby package [<%= distro[:name] %>/<%= variant[:name] %>]'
         run: |
@@ -225,7 +225,7 @@ jobs:
       matrix:
         include:
           <%- contributor_distributions.each do |distro| -%>
-          <%- variants.each do |variant| -%>
+          <%- variants_for_ruby_version(rpv).each do |variant| -%>
           - distro: '<%= distro[:name] %>'
             variant: '<%= variant[:name] %>'
             test_image: '<%= distro[:test_image] %>'