From e45305b12257fbadc3bf5a914d64d9918ccd46b5 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Thu, 14 Oct 2021 18:33:37 +0200
Subject: [PATCH] CI: use bundler-cache

---
 .github/workflows/test.yml | 10 +++++-----
 Gemfile                    |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f7afb81..490a6ad 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,9 +16,9 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        gem install bundler --no-document
-        bundle install
+        bundler-cache: true
+    # Avoid issues on these platforms
+    - if: ${{ matrix.ruby == '2.5' || matrix.ruby == '2.6' }}
+      run: gem update --system
     - name: Run test
-      run: rake compile test
+      run: bundle exec rake compile test
diff --git a/Gemfile b/Gemfile
index 8269be2..96a539e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in etc.gemspec
 gemspec
+
+# Ensure a new-enough version of fileutils is used in tests,
+# to avoid a gem activation issue, which affected Ruby 2.6, 2.5.
+# https://github.com/ruby/etc/pull/14#issuecomment-989742427
+gem 'fileutils', '>= 1.2.0'