Require system gems in api-deps package #6234
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
coolo
reviewed
Nov 13, 2018
dist/obs-bundled-gems.spec
Outdated
| @@ -51,6 +51,8 @@ This package bundles all the gems required by the Open Build Service | |||
| to make it easier to deploy the obs-server package. | |||
|
|
|||
| %define rake_version 12.3.1 | |||
| %define passenger_version 5.3.7 | |||
There was a problem hiding this comment.
I don't think there is a problem with passenger - as we don't bundle it. rack and rake are special in the sense that we have them as package for passenger and in the bundle.
And I would prefer if you checked the bundled rack version in line 106 too
ChrisBr
force-pushed
the
require_system_gems
branch
2 times, most recently
from
5ac3ad0
to
b5063eb
Compare
coolo
approved these changes
Nov 13, 2018
dmarcoux
suggested changes
Nov 13, 2018
dist/obs-bundled-gems.spec
Outdated
| @@ -104,6 +106,7 @@ bundle --local --path %{buildroot}%_libdir/obs-api/ | |||
|
|
|||
| # test that the rake_version macro is still matching our Gemfile | |||
There was a problem hiding this comment.
The comment should be updated
Rake and Rack need to get installed on the system and not with the bundled_gems archive because we require them for passenger. This caused that an update of one of these gems in the Gemfile did not trigger an update of the system gem when updating the RPM package which causes a crash of the whole application. Therefore we require them now. There are only 2 gems so it is reasonable to update the version in the spec file manually for now when we update the gem. The RPM package build will fail if we don't do it and prevents us from deploying and breaking our instance.
ChrisBr
force-pushed
the
require_system_gems
branch
from
b5063eb
to
22fa39a
Compare
dmarcoux
approved these changes
Nov 13, 2018
|
that failing rspec is the one I (hopefully) fixed yesterday. And the packages built before the comment was updated, so let's merge this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rake and Rack need to get installed on the system and not
with the bundled_gems archive because we require them for passenger.
This caused that an update of one of these gems in the Gemfile did not trigger
an update of the system gem when updating the RPM package which causes
a crash of the whole application.
Therefore we require them now. There are only 2 gems so it is reasonable to update
the version in the spec file manually for now when we update the gem. The RPM package
build will fail if we don't do it and prevents us from deploying and breaking our instance.