ood_packaging 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27c38bf93bd944bc4a2ea6e3e2e3ec1c847380fd63af529a78fbbf24c227b7d
-  data.tar.gz: de7ef57ce537716a66c0046d6fa27b89097ce11235516c36e8f94421ea3566e3
+  metadata.gz: 6ca45c5fbd72d84605c193e4fbb0f24280d4ccb727f811c603dd5681024f2598
+  data.tar.gz: ffd7017ffa3ff78b14fc8336ed59419b989913b78d33630dce5e58f96354f0c7
 SHA512:
-  metadata.gz: 2d5d1c157936e25191f5f4ba7a0f852cb110186098f27cb4d9b80ca90247177cbff7731adf8d4e3c5968e97d6753a68c970867529b19cc6a67d51461938e9aa9
-  data.tar.gz: 2015d40a9fc63026c601558592d1369590292280bf8e769651c1dd5cba0525f89fdb9d601ca55788506129feb51dc0ba54d02b423f43ef18f226e449e9ec5e74
+  metadata.gz: f38f86f3560405b8cc48b70ecda45311203f0345775858b75f34a9716efc6150d6eda0f08f43986091b2136c141398f5a433e72e712b2b29c78bd990207d96b1
+  data.tar.gz: 2353025ec62906aa3b80dcf56c2486ec949fbc2f3944ad9d1a69c8bd2ed90e323452647aa08983ff960a0f64edf040cf68cf550ed1e498f3c3ac64d712a708f4

data/lib/ood_packaging/build.rb

@@ -146,6 +146,7 @@ class OodPackaging::Build
     rpmbuild! if build_box.rpm?
     debuild! if build_box.deb?
     copy_output!
+    show_output!
     gpg_sign! if build_box.rpm? && gpg_sign?
     sanity!
   end
@@ -218,6 +219,8 @@ class OodPackaging::Build
     Dir.chdir(work_dir) do
       sh "tar -xf #{deb_name}.tar.gz"
     end
+    return unless config.fetch(:update_changelog, true)
+
     puts "\tBootstrap debian build files".blue
     Dir.chdir(deb_work_dir) do
       sh "dh_make -s -y --createorig -f ../#{deb_name}.tar.gz#{cmd_suffix} || true"
@@ -249,7 +252,8 @@ class OodPackaging::Build
     sh "sudo apt update -y#{cmd_suffix}"
     tool = [
       'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
-      '-o APT::Get::Assume-Yes=1 -o Debug::pkgProblemResolver=0 -o APT::Install-Recommends=0'
+      '-o APT::Get::Assume-Yes=1 -o APT::Get::Allow-Downgrades=1',
+      '-o Debug::pkgProblemResolver=0 -o APT::Install-Recommends=0'
     ]
     cmd = [
       'mk-build-deps --install --remove --root-cmd sudo',
@@ -292,6 +296,13 @@ class OodPackaging::Build
     end
   end
 
+  def show_output!
+    puts '== Copied output =='.blue
+    Dir["#{output_dir}/*"].each do |f|
+      puts "\tSaved output #{f}".blue
+    end
+  end
+
   def gpg_sign!
     puts '== GPG sign RPMs =='.blue
     rpms.each do |rpm|

data/lib/ood_packaging/version.rb

@@ -2,11 +2,11 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '2.1.0',
-      'default'         => '2.1.0'
+      'default'         => '2.1'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '1',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake