From cf2e8ed9c11551f83882a46ba291f9c0a74209eb Mon Sep 17 00:00:00 2001 From: Calvin Date: Mon, 18 Oct 2021 12:52:56 +0200 Subject: [PATCH 1/2] Explicitly add ffi gem to support M1/arm --- Gemfile | 1 + Gemfile.lock | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a10cfaf..2fdffc6 100644 --- a/Gemfile +++ b/Gemfile @@ -10,3 +10,4 @@ gem 'rouge', '~> 3.21' gem 'redcarpet', '~> 3.5.0' gem 'nokogiri', '~> 1.11.0' gem 'sass' +gem 'ffi', git: 'https://github.com/ffi/ffi.git' # Remove once a version > 1.15.4 is released diff --git a/Gemfile.lock b/Gemfile.lock index 5b7dd0a..b54f7ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: https://github.com/ffi/ffi.git + revision: 315d66e7b0768856d589e15bf597f4816d5cd524 + specs: + ffi (1.15.4) + GEM remote: https://rubygems.org/ specs: @@ -22,7 +28,6 @@ GEM execjs (2.7.0) fast_blank (1.0.0) fastimage (2.2.0) - ffi (1.13.1) haml (5.1.2) temple (>= 0.8.0) tilt @@ -122,6 +127,7 @@ PLATFORMS ruby DEPENDENCIES + ffi! middleman (~> 4.3) middleman-autoprefixer (~> 2.7) middleman-sprockets (~> 4.1) From c593531f69621f690da6cb66cb1b29b05c2684dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 10:53:51 +0000 Subject: [PATCH 2/2] Bump nokogiri from 1.11.1 to 1.12.5 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.1 to 1.12.5. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.1...v1.12.5) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 2fdffc6..d3034b0 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,6 @@ gem 'middleman-autoprefixer', '~> 2.7' gem 'middleman-sprockets', '~> 4.1' gem 'rouge', '~> 3.21' gem 'redcarpet', '~> 3.5.0' -gem 'nokogiri', '~> 1.11.0' +gem 'nokogiri', '~> 1.12.5' gem 'sass' gem 'ffi', git: 'https://github.com/ffi/ffi.git' # Remove once a version > 1.15.4 is released diff --git a/Gemfile.lock b/Gemfile.lock index b54f7ef..fd6f102 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,10 +82,10 @@ GEM middleman-syntax (3.2.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_portile2 (2.5.0) + mini_portile2 (2.6.1) minitest (5.14.2) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) padrino-helpers (0.13.3.4) i18n (~> 0.6, >= 0.6.7) @@ -132,7 +132,7 @@ DEPENDENCIES middleman-autoprefixer (~> 2.7) middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) - nokogiri (~> 1.11.0) + nokogiri (~> 1.12.5) redcarpet (~> 3.5.0) rouge (~> 3.21) sass