[SCM] ci-tooling packaging branch, master, updated. 3f34fc90c079f67c3eca85dedbaf6e3dd2cb4ca9

Rohan Garg rohangarg-guest at moszumanska.debian.org
Fri May 1 15:18:05 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=3f34fc9

The following commit has been merged in the master branch:
commit 3f34fc90c079f67c3eca85dedbaf6e3dd2cb4ca9
Author: Rohan Garg <rohan at garg.io>
Date:   Fri May 1 17:17:52 2015 +0200

    Don't use VERSION_ID, not required
---
 dci/docker_source.rb    | 8 ++++++++
 lib/ci/build_version.rb | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dci/docker_source.rb b/dci/docker_source.rb
new file mode 100644
index 0000000..4c8e935
--- /dev/null
+++ b/dci/docker_source.rb
@@ -0,0 +1,8 @@
+require_relative '../lib/ci/build_source'
+
+ENV['WORKSPACE'] ||= '.'
+
+Dir.chdir(ENV['WORKSPACE']) do
+  build = VcsSource.new
+  build.run(series: 'unstable')
+end
diff --git a/lib/ci/build_version.rb b/lib/ci/build_version.rb
index 0d37111..ba2e884 100644
--- a/lib/ci/build_version.rb
+++ b/lib/ci/build_version.rb
@@ -15,9 +15,8 @@ module CI
 
     def initialize(changelog)
       @changelog = changelog
-      @suffix = format('+git%s+%s',
-                       DateTime.now.strftime('%Y%m%d.%H%M'),
-                       OS::VERSION_ID)
+      @suffix = format('+git%s',
+                       DateTime.now.strftime('%Y%m%d.%H%M'))
       @tar = "#{clean_base}#{@suffix}"
       @base = "#{changelog.version(Changelog::EPOCH)}#{clean_base}#{@suffix}"
       @full = "#{base}-0ubuntu0" if OS::ID == 'ubuntu'

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list