feat(grpc): Update grpc to 1.65.1 (#69)

* feat(grpc): Update grpc to 1.65.1

* chore(lint): Update rubocop target version

Author: bougyman

.github/workflows/container.yaml

@@ -18,26 +18,22 @@ jobs:
     name: Publish the container image to GitHub Container Registry
     runs-on: ubuntu-latest
     strategy:
-      # Go easy on the builders
-      max-parallel: 2
+      # Go hard on the builders
+      max-parallel: 5
       matrix:
         alpine-version: ['3.20', '3.19']
-        ruby-version: ['3.3.2', '3.3.1']
+        ruby-version: ['3.3.4', '3.3.3', '3.3.2']
         # 3.3.0 isn't published (to docker.io) for 3.20, so we only do 3.19, the
         # latest published version.
-        include:
-          - alpine-version: '3.19'
-            ruby-version: '3.3.0'
+        #include:
+        #- alpine-version: '3.19'
+        #ruby-version: '3.3.0'
     steps:
       -
         name: Checkout repository
         uses: actions/checkout@v4
       -
-        # Ruby doesn't publish 3.3.0-alpine3.20 as of June 3, 2024,
-        # so we skip this combination.
-        if: >
-          matrix.alpine_version != '3.20' || matrix.ruby_version != '3.3.0'
-        name: Publish to github
+        name: Publish to ghcr.io
         env:
           ALPINE_VERSION: ${{ matrix.alpine-version }}
           REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-minitest
 
 AllCops:
-  TargetRubyVersion: 3.2.0
+  TargetRubyVersion: 3.3.0
   NewCops: enable
 
 

ci/build_image.sh

@@ -30,7 +30,8 @@ base_dir=$(basename "$(pwd)")
 : "${IMAGE_NAME:=$base_dir}"
 : "${LICENSE:=MIT}"
 : "${REGISTRY:=ghcr.io}"
-: "${RUBY_VERSION:=3.3.2}"
+: "${RUBY_VERSION:=3.3.4}"
+: "${REGISTRY_TOKEN:=$GITHUB_TOKEN}"
 
 base_image_tag="$RUBY_VERSION-alpine$ALPINE_VERSION"
 base_exists=$(skopeo list-tags docker://docker.io/ruby |jq -r "any(.Tags[] == \"$base_image_tag\"; .)")
@@ -155,7 +156,6 @@ if [ $# -gt 0 ]; then
     shift
 fi
 
-
 if [ -z "$CONTAINERFILE" ]; then
     printf "No containerfile specified, looking for default locations\n"
     for containerfile in Containerfile Dockerfile
@@ -218,8 +218,8 @@ $runtime build --tag "$full_tag" "$@" \
                --label org.opencontainers.image.revision="$revision" \
                --label org.opencontainers.image.url="$repo_url" \
                --label org.opencontainers.image.title="$IMAGE_NAME" \
-               --label org.opencontainers.image.source="Generated by gitops_tools/bin/build_image ($USER@$HOSTNAME)" \
-               --label org.opencontainers.image.version="$tag" \
+               --label org.opencontainers.image.source="Generated by ruby-automation's build_image.sh ($USER@$HOSTNAME)" \
+               --label org.opencontainers.image.version="$full_tag" \
                --label shortref="$shortref" \
                --build-arg ALPINE_VERSION="$ALPINE_VERSION" \
                --build-arg RUBY_VERSION="$RUBY_VERSION" \
@@ -229,25 +229,26 @@ $runtime build --tag "$full_tag" "$@" \
 if ! $runtime login --get-login "$REGISTRY" >/dev/null 2>/dev/null
 then
     printf "Not logged in to '%s', trying to login\n" "$REGISTRY" >&2
-    [ -z "$GITHUB_TOKEN" ] && die 9 "No GITHUB_TOKEN set, cannot login"
-    printf "%s" "$GITHUB_TOKEN" | $runtime login -u "$GITHUB_TOKEN" --password-stdin "$REGISTRY" || die 10 "Failed to login to $REGISTRY"
+    [ -z "$REGISTRY_TOKEN" ] && die 9 "No REGISTRY_TOKEN (nor GITHUB_TOKEN) set, cannot login"
+    printf "%s" "$REGISTRY_TOKEN" | $runtime login -u "$REGISTRY_TOKEN" --password-stdin "$REGISTRY" || die 10 "Failed to login to $REGISTRY"
 fi
 
-mapfile -t tags < <(echo "$tag" | awk -F'.' 'NF==3{print $1"."$2"."$3; print $1"."$2; print $1; next} NF==2{print $1"."$2; print $1; next} {print}')
+# Split 1.2.3 into 1.2.3, 1.2, 1. We want to tag our image with all 3 of these
+mapfile -t tags < <(echo "$tag" | awk -F'.' 'NF==3{print; print $1"."$2; print $1; next} NF==2{print; print $1; next} {print}')
 for t in "${tags[@]}"
 do
     new_tag=$IMAGE_NAME:$t-ruby$RUBY_VERSION-alpine$ALPINE_VERSION
-    debug "Tagging %s as %s\n" "$full_tag" "$new_tag"
+    registry_image_name="$REGISTRY/$owner/$new_tag"
     if [ "$runtime" = "podman" ]
     then
         if [ "$full_tag" != "$new_tag" ]
         then
+            debug "Tagging %s as %s\n" "$full_tag" "$new_tag"
             podman tag "$full_tag" "$new_tag" || die 11 "Failed to tag image $full_tag as $new_tag"
         fi
-        registry_image_name="$REGISTRY/$owner/$new_tag"
         podman push "$new_tag" "$registry_image_name" || die 12 "Failed to push image $new_tag to $registry_image_name"
     else
-        registry_image_name="$REGISTRY/$owner/$new_tag"
+        debug "Tagging %s as %s\n" "$full_tag" "$registry_image_name"
         docker tag "$full_tag" "$registry_image_name" || die 13 "Failed to tag image $full_tag as $registry_image_name"
         docker push "$registry_image_name" || die 14 "Failed to push image $new_tag to $registry_image_name"
     fi

dapr.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'Library for interacting with dapr.'
   spec.description = 'Wrappers to the dapr protobuf spec.'
   spec.homepage = 'https://github.com/rubyists/dapr'
-  spec.required_ruby_version = '>= 3.2.0'
+  spec.required_ruby_version = '>= 3.3.0'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 

oci/Containerfile

@@ -1,5 +1,5 @@
-ARG ALPINE_VERSION=3.19
-ARG RUBY_VERSION=3.3.1
+ARG ALPINE_VERSION=3.20
+ARG RUBY_VERSION=3.3.4
 FROM docker.io/ruby:$RUBY_VERSION-alpine$ALPINE_VERSION AS build-env
 
 # Setting env up
@@ -33,8 +33,8 @@ RUN bundle config set build.nokogiri --use-system-libraries && \
 RUN rm -rf node_modules tmp/cache app/assets vendor/assets spec
 
 ############### Build step done ###############
-ARG ALPINE_VERSION=3.19
-ARG RUBY_VERSION=3.3.1
+ARG ALPINE_VERSION=3.20
+ARG RUBY_VERSION=3.3.4
 FROM docker.io/ruby:$RUBY_VERSION-alpine$ALPINE_VERSION
 
 ARG APP_ROOT=/app