Skip to content

Commit

Permalink
www/gitlab-ce: Fix Gemfile
Browse files Browse the repository at this point in the history
The (similar) fix for Gemfile was already committed [1] but being removed later during gitlab-ce updates.

(cd /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.1 && /bin/rm -f Gemfile.lock && bundle install --local)
Don't run Bundler as root. Installing your bundle as root will break this
application for all non-root users on this machine.
Could not find gem 'aws-sdk-core (~> 3.185.1)' in cached gems or installed
locally.

The source contains the following gems matching 'aws-sdk-core':
  * aws-sdk-core-3.186.0
*** Error code 7

Reference:	https://cgit.freebsd.org/ports/commit/www/gitlab-ce?id=cd3ccf5407757430ac5899a4ba0fecd61992a431 [1]
  • Loading branch information
sunpoet committed Nov 14, 2023
1 parent cf9a5a2 commit 907cb05
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion www/gitlab-ce/files/patch-Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- Gemfile.orig 2023-10-20 08:41:39 UTC
--- Gemfile.orig 2023-10-30 16:33:01 UTC
+++ Gemfile
@@ -56,7 +56,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss

Expand Down Expand Up @@ -38,6 +38,15 @@
gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -196,7 +196,7 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-core', '~> 3.185.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'aws-sdk-core', '~> 3.185' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -385,80 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1',

gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
Expand Down

0 comments on commit 907cb05

Please sign in to comment.