Skip to content

Commit

Permalink
www/gitlab-ce: Fix Gemfile to match RUN_DEPENDS
Browse files Browse the repository at this point in the history
The error message is as follows:
cp -f /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.0/config/database.yml.postgresql /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.0/config/database.yml.sample
(cd /wrkdirs/usr/ports/www/gitlab-ce/work/gitlab-foss-v16.5.0 && /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 'grpc (~> 1.58.0)' in cached gems or installed locally.

The source contains the following gems matching 'grpc':
  * grpc-1.59.0
*** Error code 7

Approved by:	portmgr (blanket)
  • Loading branch information
sunpoet committed Nov 1, 2023
1 parent 80c578f commit 1745375
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
1 change: 0 additions & 1 deletion www/gitlab-ce/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-duo_api>=1.3<2:security/rubygem-duo_api \
rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2


BUILD_DEPENDS= gem:devel/ruby-gems \
${MY_DEPENDS}

Expand Down
9 changes: 9 additions & 0 deletions www/gitlab-ce/files/patch-Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,15 @@
gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory

gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -536,7 +437,7 @@ gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfi
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory

-gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory

gem 'google-protobuf', '~> 3.24', '>= 3.24.4' # rubocop:todo Gemfile/MissingFeatureCategory

@@ -557,7 +458,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory

Expand Down

0 comments on commit 1745375

Please sign in to comment.