diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec9bf51b..56c8a261 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,10 +43,6 @@ test jruby: script: ./spec.sh jruby 9.0.0.0 allow_failure: true -test ruby 2/3: - <<: *test_settings - script: - ./spec.sh ruby 2.3 test ruby 2/4: <<: *test_settings only: diff --git a/Gemfile b/Gemfile index 0c07ae2c..af39ba9a 100644 --- a/Gemfile +++ b/Gemfile @@ -5,27 +5,17 @@ ruby RUBY_VERSION source "https://rubygems.org" gemspec -if RUBY_VERSION < "2.2.0" - gem "rake", "~> 12.3" -else - gem "rake", "~> 13.0" -end +gem "rake", "~> 13.0" group :test do gem "http-form_data", ">= 2.0.0" gem "minitest" gem "minitest-proveit" + gem "nokogiri" gem "ruby-ntlm" gem "sentry-ruby" if RUBY_VERSION >= "2.4.0" gem "spy" - if RUBY_VERSION < "2.3.0" - gem "webmock", "< 3.15.0" - elsif RUBY_VERSION < "2.4.0" - gem "webmock", "< 3.17.0" - else - gem "webmock" - end - gem "nokogiri" + gem "webmock" gem "websocket-driver" gem "net-ssh", "~> 4.2.0" if RUBY_VERSION < "2.2.0" @@ -33,22 +23,20 @@ group :test do gem "ddtrace" platform :mri do - if RUBY_VERSION >= "2.3.0" - if RUBY_VERSION < "2.5.0" - gem "google-protobuf", "< 3.19.2" - elsif RUBY_VERSION < "2.7.0" - gem "google-protobuf", "< 3.22.0" - end - if RUBY_VERSION <= "2.6.0" - gem "grpc", "< 1.49.0" - else - gem "grpc" - end - gem "logging" - gem "marcel", require: false - gem "mimemagic", require: false - gem "ruby-filemagic", require: false + if RUBY_VERSION < "2.5.0" + gem "google-protobuf", "< 3.19.2" + elsif RUBY_VERSION < "2.7.0" + gem "google-protobuf", "< 3.22.0" end + if RUBY_VERSION <= "2.6.0" + gem "grpc", "< 1.49.0" + else + gem "grpc" + end + gem "logging" + gem "marcel", require: false + gem "mimemagic", require: false + gem "ruby-filemagic", require: false if RUBY_VERSION >= "3.0.0" gem "multi_json", require: false @@ -65,17 +53,6 @@ group :test do gem "net-ssh-gateway" end - platform :mri_21 do - gem "rbnacl" - end - - platform :mri_23 do - if RUBY_VERSION >= "2.3.0" - gem "openssl", "< 2.0.6" # force usage of openssl version we patch against - end - gem "msgpack", "<= 1.3.3" - end - platform :jruby do gem "jruby-openssl" # , git: "https://github.com/jruby/jruby-openssl.git", branch: "master" gem "ruby-debug" @@ -84,7 +61,6 @@ group :test do gem "aws-sdk-s3" gem "faraday" gem "idnx" if RUBY_VERSION >= "2.4.0" - gem "multipart-post", "< 2.2.0" if RUBY_VERSION < "2.3.0" gem "oga" if RUBY_VERSION >= "3.0.0" @@ -96,13 +72,7 @@ group :test do end group :coverage do - if RUBY_VERSION < "2.2.0" - gem "simplecov", "< 0.11.0" - elsif RUBY_VERSION < "2.3" - gem "simplecov", "< 0.11.0" - elsif RUBY_VERSION < "2.4" - gem "simplecov", "< 0.19.0" - elsif RUBY_VERSION < "2.5" + if RUBY_VERSION < "2.5" gem "simplecov", "< 0.21.0" else gem "simplecov" @@ -110,18 +80,10 @@ group :coverage do end group :assorted do - if RUBY_VERSION < "2.2.0" - gem "pry", "~> 0.12.2" - else - gem "pry" - end + gem "pry" platform :mri do - if RUBY_VERSION < "2.2.0" - gem "pry-byebug", "~> 3.4.3" - else - gem "debug" if RUBY_VERSION >= "3.1.0" - gem "pry-byebug" - end + gem "debug" if RUBY_VERSION >= "3.1.0" + gem "pry-byebug" end end diff --git a/docker-compose-ruby-2.1.yml b/docker-compose-ruby-2.1.yml deleted file mode 100644 index 16b21388..00000000 --- a/docker-compose-ruby-2.1.yml +++ /dev/null @@ -1,4 +0,0 @@ -version: '3' -services: - httpx: - image: ruby:2.1 diff --git a/docker-compose-ruby-2.2.yml b/docker-compose-ruby-2.2.yml deleted file mode 100644 index ff122885..00000000 --- a/docker-compose-ruby-2.2.yml +++ /dev/null @@ -1,4 +0,0 @@ -version: '3' -services: - httpx: - image: ruby:2.2 diff --git a/docker-compose-ruby-2.3.yml b/docker-compose-ruby-2.3.yml deleted file mode 100644 index 5c33e12b..00000000 --- a/docker-compose-ruby-2.3.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3' -services: - httpx: - image: ruby:2.3 - environment: - - HTTPBIN_COALESCING_HOST=another - links: - - "nghttp2:another" diff --git a/test/support/ci/build.sh b/test/support/ci/build.sh index 704b4247..ca169f46 100755 --- a/test/support/ci/build.sh +++ b/test/support/ci/build.sh @@ -15,15 +15,6 @@ if [[ "$RUBY_ENGINE" = "truffleruby" ]]; then dnf install -y iptables iproute which file idn2 git xz elif [[ "$RUBY_PLATFORM" = "java" ]]; then apt-get update && apt-get install -y build-essential iptables iproute2 file idn2 git -elif [[ ${RUBY_VERSION:0:3} = "2.3" ]]; then - echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list - apt-get update && apt-get install -y iptables iproute2 iptables-nftables-compat libmagic-dev shared-mime-info # openssl=1.0.2l openssl-dev=1.0.2l - IPTABLES=iptables - # installing custom openssl - wget http://deb.debian.org/debian/pool/main/o/openssl1.0/libssl1.0.2_1.0.2u-1~deb9u1_amd64.deb - dpkg -i libssl1.0.2_1.0.2u-1~deb9u1_amd64.deb - wget http://deb.debian.org/debian/pool/main/o/openssl1.0/libssl1.0-dev_1.0.2u-1~deb9u1_amd64.deb - dpkg -i libssl1.0-dev_1.0.2u-1~deb9u1_amd64.deb else apt-get update && apt-get install -y iptables iproute2 idn2 libmagic-dev shared-mime-info fi