Verified Commit f0c4775c authored by Hercules Merscher's avatar Hercules Merscher 🌴 Committed by GitLab
Browse files

Merge branch 'bvl/drop-ruby-3-2-support' into 'master' 

chore(deps): drop support for Ruby 3.2

See merge request !238

Merged-by: Hercules Merscher's avatarHercules Merscher <hmerscher@gitlab.com>
Approved-by: Hercules Merscher's avatarHercules Merscher <hmerscher@gitlab.com>
Co-authored-by: Bob Van Landuyt's avatarBob Van Landuyt <bob@gitlab.com>
Co-authored-by: default avatarGitLab Renovate Bot <ops-contact+gl-common-ci-tasks-self-renovate@gitlab.com>
parents 810d4635 1b0949d6

.gitlab-ci-asdf-versions.yml

+1 −1
Original line number Diff line number Diff line 
# DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables.sh to update this

variables:

    GL_ASDF_RUBY_VERSION: "3.4.8"

    GL_ASDF_RUBY_VERSION: "4.0.1"

    GL_ASDF_SHELLCHECK_VERSION: "0.11"

    GL_ASDF_SHFMT_VERSION: "3.13"

.gitlab-ci.yml

+11 −12
Original line number Diff line number Diff line
@@ -27,21 +27,20 @@ include: 


  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v3.11



.test_template: &test_definition

  extends: .with_bundle

  image: ruby:${RUBY_VERSION}

  stage: validate

  script:

    - gem install bundler --no-document

    - bundle config --local path vendor

    - bundle install

    - bundle exec rake verify build install



ruby-versions:

  <<: *test_definition

  extends: rspec

  image: ${CI_REGISTRY}/gitlab-com/gl-infra/common-ci-tasks-images/ruby:${RUBY_VERSION}

  parallel:

    matrix:

      - RUBY_VERSION: ["3.4"]



# These versions aren't built in common CI tasks, so use a public ruby image

legacy-ruby-versions:

  extends: rspec

  image: ruby:${RUBY_VERSION}

  parallel:

    matrix:

      - RUBY_VERSION: ["3.2", "3.3"]

      - RUBY_VERSION: ["3.3"]



deploy:

  rules:

.tool-versions

+1 −1
Original line number Diff line number Diff line 
ruby 3.4.8

ruby 4.0.1

shfmt 3.13

shellcheck 0.11

gitlab-labkit.gemspec

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec| 
  spec.bindir = "exe"

  spec.executables = %w[labkit-logging]

  spec.require_paths = ["lib"]

  spec.required_ruby_version = "~> 3.2"

  spec.required_ruby_version = ">= 3.3", "< 5"



  # Please maintain alphabetical order for dependencies

  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.1.0"
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec| 


  # Please maintain alphabetical order for dev dependencies

  spec.add_development_dependency "excon", "~> 0.78.1"

  spec.add_development_dependency "faraday", "~> 1.10.3"

  spec.add_development_dependency "faraday", "~> 2.13"

  spec.add_development_dependency "gitlab-dangerfiles", "~> 2.11.0"

  spec.add_development_dependency "gitlab-styles", "~> 13.1"

  spec.add_development_dependency "grpc-tools", ">= 1.75"

lib/labkit/tracing/open_telemetry_factory.rb

+1 −1
Original line number Diff line number Diff line 
# frozen_string_literal: true



require "base64"

require "cgi"

require "cgi/escape"

require "active_support"

require "active_support/core_ext"