Commit ec978431 authored by Bob Van Landuyt's avatar Bob Van Landuyt 💬
Browse files

Merge branch 'sh-add-ruby-ci' into 'master' 

Add and fix Ruby 3.1 and 3.2 to CI builds

See merge request !113
parents f7dedf1c 945f45f6

.gitlab-ci.yml

+12 −9
Original line number Diff line number Diff line 
default:

  image: ruby:2.7

  image: ruby:3.1



workflow:

  rules:
@@ -11,19 +11,22 @@ workflow: 
    - if: '$CI_COMMIT_TAG'



.test_template: &test_definition

  image: ruby:${RUBY_VERSION}

  stage: test

  script:

    - gem install bundler

    - gem install bundler --no-document

    - bundle config --local path vendor

    - bundle install

    - bundle exec rake verify build install



test:3.0:

  image: ruby:3.0

  <<: *test_definition



test:2.7:

  image: ruby:2.7

  cache:

    key: ${CI_JOB_IMAGE}

    paths:

      - vendor/ruby

ruby:

  <<: *test_definition

  parallel:

    matrix:

      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]



static-analysis:

  before_script:

gitlab-labkit.gemspec

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ Gem::Specification.new do |spec| 
  spec.add_development_dependency "rack", "~> 2.0"

  spec.add_development_dependency "rake", "~> 12.3"

  spec.add_development_dependency "rest-client", "~> 2.1.0"

  spec.add_development_dependency "rspec", "~> 3.10.0"

  spec.add_development_dependency "rspec-parameterized", "~> 0.4"

  spec.add_development_dependency "rspec", "~> 3.12.0"

  spec.add_development_dependency "rspec-parameterized", "~> 1.0"

  spec.add_development_dependency "rufo", "0.9.0"

  spec.add_development_dependency "sidekiq", ">= 5.2", "< 7"

  spec.add_development_dependency "webrick", "~> 1.7.0"

spec/labkit/tracing/factory_spec.rb

+3 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ describe Labkit::Tracing::Factory do 
      end



      it "processes connections with parameters" do

        expect(Labkit::Tracing::JaegerFactory).to receive(:create_tracer).with(service_name, a: "1", b: "2", c: "3").and_return(mock_tracer)

        expect(Labkit::Tracing::JaegerFactory).to receive(:create_tracer).with(service_name, { a: "1", b: "2", c: "3" }).and_return(mock_tracer)



        expect(described_class.create_tracer(service_name, "opentracing://jaeger?a=1&b=2&c=3")).to be(mock_tracer)

      end
@@ -40,10 +40,12 @@ describe Labkit::Tracing::Factory do 
      it "processes connections with basic auth credentials" do

        expect(Labkit::Tracing::JaegerFactory).to receive(:create_tracer).with(

          service_name,

          {

            a: "1",

            b: "2",

            c: "3",

            http_endpoint: "https://foo:bar@observe.gitlab.com",

          }

        ).and_return(mock_tracer)



        expect(described_class.create_tracer(service_name, "opentracing://jaeger?http_endpoint=https://foo:bar@observe.gitlab.com&a=1&b=2&c=3")).to be(mock_tracer)