From 1e67a20d63676720cd740b16983e433f5f2b8e49 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Tue, 17 Dec 2024 08:10:39 +0000 Subject: [PATCH 1/2] Add bundler platforms for Apple systems Bumping nio4r to compatible version too. --- Gemfile.lock | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5dfe51a8..3cf1a398 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,8 +138,9 @@ GEM activesupport (>= 5.0.0) json (2.5.1) jwt (2.2.3) - libv8-node (16.10.0.0) libv8-node (16.10.0.0-aarch64-linux) + libv8-node (16.10.0.0-arm64-darwin) + libv8-node (16.10.0.0-x86_64-darwin) libv8-node (16.10.0.0-x86_64-linux) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -163,7 +164,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) netrc (0.11.0) - nio4r (2.5.8) + nio4r (2.7.4) nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -356,7 +357,9 @@ GEM PLATFORMS aarch64-linux + arm64-darwin ruby + x86_64-darwin x86_64-linux DEPENDENCIES From 574f365e84e43ae28eed17a08a48cc343ec9a853 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 12 Dec 2024 14:19:31 +0000 Subject: [PATCH 2/2] Upgrade Github Rubocop action --- .github/workflows/rubocop.yml | 12 +++++++++--- Gemfile.lock | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 5cbeca11..cb4cfef1 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -4,17 +4,23 @@ on: [pull_request] jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest + env: + BUNDLE_ONLY: rubocop steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Ruby uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 + - run: | + gem install securerandom -v 0.3.2 + gem install activesupport -v 7.1.5.1 + - name: Run RuboCop linter - uses: reviewdog/action-rubocop@v1 + uses: reviewdog/action-rubocop@v2 with: github_token: ${{ secrets.github_token }} rubocop_version: gemfile diff --git a/Gemfile.lock b/Gemfile.lock index 3cf1a398..3512b1e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,7 @@ GEM faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) faraday-net_http (2.0.2) - ffi (1.15.5) + ffi (1.17.0) fugit (1.5.3) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4)