Merge pull request #2162 from parndt/use-ruby-setup-ruby

ci: switch to the ruby/setup-ruby action
sparklemotion · Jan 4, 2021 · 4b55ecb · 4b55ecb
2 parents 940823f + e6c0772
commit 4b55ecb
Showing 1 changed file with 9 additions and 31 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -12,42 +12,22 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: '2.7'
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
+
       - name: Set ENV
         run: |
           echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
           echo "NOKOGIRI_USE_SYSTEM_LIBRARIES=t" >> $GITHUB_ENV
-      - name: Install dependencies
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle config jobs $((1 + $(sysctl -n hw.activecpu)))
-          bundle install
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: '2.7'
       - run: bundle exec rake compile
       - run: bundle exec rake test
 
   cruby-test-vendored-libraries:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: '2.7'
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
       - uses: actions/cache@v2
         with:
           path: ports/archives
@@ -58,11 +38,9 @@ jobs:
       - name: Set ENV
         run: |
           echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
-      - name: Install dependencies
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle config jobs $((1 + $(sysctl -n hw.activecpu)))
-          bundle install
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: '2.7'
       - run: bundle exec rake compile
       - run: bundle exec rake test