Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support injecting additional dependencies into deb package builds #258

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ Metrics/AbcSize:

# rspec
RSpec/MultipleMemoizedHelpers:
Max: 10
Max: 11
RSpec/MultipleExpectations:
Enabled: false
RSpec/ExampleLength:
Enabled: false
RSpec/MessageSpies:
EnforcedStyle: receive
RSpec/NestedGroups:
Max: 4
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ood_packaging (0.13.1)
ood_packaging (0.13.2)
rake (~> 13.0.1)

GEM
Expand Down
2 changes: 2 additions & 0 deletions lib/ood_packaging/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ def install_rpm_dependencies!

def install_deb_dependencies!
sh "sudo apt update -y#{cmd_suffix}"
extra_depends = config.fetch(:extra_depends, nil)
tool = [
'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
'-o APT::Get::Assume-Yes=1 -o APT::Get::Allow-Downgrades=1',
Expand All @@ -289,6 +290,7 @@ def install_deb_dependencies!
"#{package}-build-deps*.changes"
]
Dir.chdir(deb_work_dir) do
sh "sed -i 's|@EXTRA_DEPENDS@|#{extra_depends}|g' debian/control#{cmd_suffix}" unless extra_depends.nil?
sh "#{cmd.join(' ')}#{cmd_suffix}"
sh "rm -f #{cleanup.join(' ')}#{cmd_suffix}"
end
Expand Down
2 changes: 1 addition & 1 deletion lib/ood_packaging/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Version code for OodPackaging
module OodPackaging
VERSION = '0.13.1'
VERSION = '0.13.2'
PACKAGE_VERSION = {
'ondemand-release' => {
'(ubuntu|debian)' => '3.1.0',
Expand Down
35 changes: 28 additions & 7 deletions spec/ood_packaging/build_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -146,27 +146,48 @@
context 'when doing deb builds' do
let(:dist) { 'ubuntu-20.04' }
let(:version) { 'v0.0.1' }

it 'installs DEB dependencies using apt' do
let(:cleanup) do
[
'ondemand-build-deps*.buildinfo',
'ondemand-build-deps*.changes'
]
end
let(:expected_cmd) do
tool = [
'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
'-o APT::Get::Assume-Yes=1 -o APT::Get::Allow-Downgrades=1',
'-o Debug::pkgProblemResolver=0 -o APT::Install-Recommends=0'
]
expected_cmd = [
[
'mk-build-deps', '--install', '--remove', '--root-cmd sudo',
"--tool='#{tool.join(' ')}'",
'2>/dev/null 1>/dev/null'
]
cleanup = [
'ondemand-build-deps*.buildinfo',
'ondemand-build-deps*.changes'
]
end

it 'installs DEB dependencies using apt' do
expect(build).to receive(:sh).with('sudo apt update -y 2>/dev/null 1>/dev/null')
expect(build).not_to receive(:sh).with(/^sed.+/)
expect(build).to receive(:sh).with(expected_cmd.join(' '))
expect(build).to receive(:sh).with("rm -f #{cleanup.join(' ')} 2>/dev/null 1>/dev/null")
build.install_dependencies!
end

context 'when extra_depends is defined' do
let(:dist) { 'debian-12' }

before do
allow(build).to receive(:packaging_config).and_return({ 'debian-12' => { 'extra_depends' => 'npm' } })
end

it 'updates debian/control' do
expect(build).to receive(:sh).with('sudo apt update -y 2>/dev/null 1>/dev/null')
expect(build).to receive(:sh).with("sed -i 's|@EXTRA_DEPENDS@|npm|g' debian/control 2>/dev/null 1>/dev/null")
expect(build).to receive(:sh).with(expected_cmd.join(' '))
expect(build).to receive(:sh).with("rm -f #{cleanup.join(' ')} 2>/dev/null 1>/dev/null")
build.install_dependencies!
end
end
end
end

Expand Down
Loading