Merge branch 'master' into branch-coverage

DataDog · Mar 26, 2021 · 84fa35b · 84fa35b
2 parents 6bfc8e0 + 000e167
commit 84fa35b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.circleci/images/primary/Dockerfile-jruby-9.2-latest b/.circleci/images/primary/Dockerfile-jruby-9.2-latest
@@ -16,7 +16,8 @@ RUN set -ex; \
             locales sudo openssh-client ca-certificates tar gzip parallel \
             net-tools netcat unzip zip bzip2 gnupg curl wget \
             tzdata rsync vim \
-            build-essential; \
+            build-essential \
+            shared-mime-info; \
         rm -rf /var/lib/apt/lists/*;
 
 # Set timezone to UTC by default

diff --git a/Appraisals b/Appraisals
@@ -901,7 +901,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'pg', platform: :ruby
     gem 'activerecord-jdbcpostgresql-adapter', '>= 60.2', platform: :jruby
     gem 'presto-client', '>=  0.5.14'
-    gem 'qless'
+    gem 'qless', (RUBY_PLATFORM == 'java' ? '0.10.0' : '>= 0') # Newer releases require `rusage`, which is not available for JRuby
     gem 'racecar', '>= 0.3.5'
     gem 'rack'
     gem 'rack-test'