fix(ci): build by updating ruby version

Author: gildesmarais

.github/workflows/gh-pages.yml

@@ -4,35 +4,47 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
-  deploy:
-    runs-on: ubuntu-18.04
+  build:
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/main'
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
+          ruby-version: 3.1
+          bundler-cache: true
+
+      - name: Build the site
+        env:
+          JEKYLL_ENV: production
+        run: |
+          ./bin/data-update
+          bundle exec jekyll build
+
+  deploy:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - uses: actions/checkout@v2
 
-      - name: Cache gems
-        uses: actions/cache@preview
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ hashFiles('Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
+          ruby-version: 3.1
+          bundler-cache: true
 
       - name: Build the site
         env:
           JEKYLL_ENV: production
         run: |
-          gem install bundler -v '~> 2.0'
-          bundle config path vendor/bundle
-          make update
-          bundle config --global frozen 1
-          bundle install --jobs 4 --retry 3
+          ./bin/data-update
           bundle exec jekyll build
 
       - name: deploy

.mergify.yml

@@ -2,6 +2,8 @@ queue_rules:
   - name: dependabot
     conditions:
       - author=dependabot[bot]
+      - status-success=build
+      - base=main
 
 pull_request_rules:
   - name: automatic merge for Dependabot pull requests

Makefile

@@ -20,4 +20,3 @@ update:
 
 serve: setup
 	bundle exec jekyll s --drafts --trace
-