56 lines
1.4 KiB
Diff
56 lines
1.4 KiB
Diff
|
From: Antoine Martin (ayakael) <dev@ayakael.net)
|
||
|
|
Date: Wed, 09 Mar 2023 17:24:00 +0200
|
||
|
|
Subject: Don't fetch rugged gem from RubyGems
|
||
|
|
|
||
|
|
Rugged gem, since 1.5.0, has issues related libgit2 version checking.
|
||
|
|
Thus, install fails.
|
||
|
|
|
||
|
|
Therefore this patch sources the gem from the ruby-rugged Alpine package
|
||
|
|
and copies it into vendor/ before running bundler
|
||
|
|
|
||
|
|
diff --git a/ruby/Gemfile.orig b/ruby/Gemfile
|
||
|
|
index 5982fc4..6c339f7 100644
|
||
|
|
--- a/ruby/Gemfile.orig
|
||
|
|
+++ b/ruby/Gemfile
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
source 'https://rubygems.org'
|
||
|
|
|
||
|
|
-gem 'rugged', '~> 1.2'
|
||
|
|
+gem 'rugged', path: 'vendor/rugged', require: false
|
||
|
|
gem 'github-linguist', '~> 7.20.0', require: 'linguist'
|
||
|
|
gem 'gitlab-markup', '~> 1.7.1'
|
||
|
|
gem 'activesupport', '~> 6.1.6.1'
|
||
|
|
diff --git a/ruby/Gemfile.lock.orig b/ruby/Gemfile.lock
|
||
|
|
index 5cfc90f..7cd8b85 100644
|
||
|
|
--- a/ruby/Gemfile.lock.orig
|
||
|
|
+++ b/ruby/Gemfile.lock
|
||
|
|
@@ -4,6 +4,11 @@ PATH
|
||
|
|
grpc (1.42.0)
|
||
|
|
google-protobuf (~> 3.18)
|
||
|
|
|
||
|
|
+PATH
|
||
|
|
+ remote: vendor/rugged
|
||
|
|
+ specs:
|
||
|
|
+ rugged (1.5.0.1)
|
||
|
|
+
|
||
|
|
GEM
|
||
|
|
remote: https://rubygems.org/
|
||
|
|
specs:
|
||
|
|
@@ -193,7 +198,6 @@ GEM
|
||
|
|
parser (>= 2.7.0.1)
|
||
|
|
ruby-progressbar (1.10.1)
|
||
|
|
rubyzip (2.3.2)
|
||
|
|
- rugged (1.2.0)
|
||
|
|
sanitize (6.0.0)
|
||
|
|
crass (~> 1.0.2)
|
||
|
|
nokogiri (>= 1.12.0)
|
||
|
|
@@ -247,7 +251,7 @@ DEPENDENCIES
|
||
|
|
rspec
|
||
|
|
rspec-parameterized
|
||
|
|
rubocop (~> 0.69)
|
||
|
|
- rugged (~> 1.2)
|
||
|
|
+ rugged!
|
||
|
|
sentry-raven (~> 3.0)
|
||
|
|
timecop
|
||
|
|
|