Skip to content

Commit

Permalink
Integrate PATCH Don't drop any gems from bundle
Browse files Browse the repository at this point in the history
This commit put the patch to source code
  • Loading branch information
MalloZup committed Jul 3, 2020
1 parent 0edec1e commit b885e83
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ INIT_STYLE = suse
# Set this to true to bundle gems inside rpm
BUNDLE_GEMS = false

# This should be discoverable in a better way
RUBY_ABI = 2.1.0
RUBY_ABI = "$(echo "puts \"#{Gem.ruby_api_version}\"" | ruby)"

# Set this never to 1, it's used only within vagrant for development
WITHIN_VAGRANT = 0
Expand All @@ -53,8 +52,6 @@ all: scripts/hawk.$(INIT_STYLE) scripts/hawk.service scripts/hawk.service.bundle
export BUNDLE_WITHOUT="test" && \
# Generate Gemfile.lock \
bundle list && \
# Strip unwanted gems from Gemfile.lock \
sed -i -e '/\brdoc\b/d' -e '/\brake\b/d' -e '/\bjson\b/d' Gemfile.lock && \
# Finally package and install the gems \
bundle package && bundle install --local --deployment ; \
fi ; \
Expand Down
1 change: 1 addition & 0 deletions doc/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Actively maintained are:

- SLE12SP4 and SLES12P3 -> `sles12-sp3 and sp4` github branches.

- openSUSE factory -> `factory`
# Note on sle15 and sles12 branches:

sle15 and sle12 have completely different design and also, the ruby supported is quite different
Expand Down

0 comments on commit b885e83

Please sign in to comment.