summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2015-07-03 08:57:32 +0300
committerLars Wirzenius <liw@liw.fi>2015-07-03 08:57:32 +0300
commited375a2762c83cecfa4315592fe279ad144d69dd (patch)
treedff29ae247aa917a13f8a8d8e38b3c51ad164585 /doc
parent1abe18ae501e0c3645949caf5846fa0538668057 (diff)
downloadick-ed375a2762c83cecfa4315592fe279ad144d69dd.tar.gz
Add 0 to the upstream CI version suffix
Diffstat (limited to 'doc')
-rw-r--r--doc/060-cleanly.yarn12
-rw-r--r--doc/070-pipeline.yarn6
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/060-cleanly.yarn b/doc/060-cleanly.yarn
index 4de29b5..b156134 100644
--- a/doc/060-cleanly.yarn
+++ b/doc/060-cleanly.yarn
@@ -26,7 +26,7 @@ this, we need to tell it the build number.
WHEN user runs, in foo,
... cleanly --ci --buildno=5 --debian-release=debian8 get-upstream-version
- THEN the output is "3.2.ci5\n"
+ THEN the output is "3.2.0ci5\n"
In release build mode, however, we want no mangling.
@@ -41,7 +41,7 @@ builds, the mangled upstream version is used.
WHEN user runs, in foo,
... cleanly --ci --buildno 42 --debian-release=debian7 tarball
- THEN file foo-3.2.ci42.tar.xz exists
+ THEN file foo-3.2.0ci42.tar.xz exists
For release builds, it's the declared upstream version.
@@ -60,9 +60,9 @@ appended.
WHEN user runs, in foo,
... cleanly --ci --buildno 42 --debian-release debian7
... --debian-codename unstable dsc
- THEN file foo_3.2.ci42.orig.tar.xz exists
- AND file foo_3.2.ci42-1.debian7.debian.tar.xz exists
- AND file foo_3.2.ci42-1.debian7.dsc exists
+ THEN file foo_3.2.0ci42.orig.tar.xz exists
+ AND file foo_3.2.0ci42-1.debian7.debian.tar.xz exists
+ AND file foo_3.2.0ci42-1.debian7.dsc exists
For a release build, once again, no version mangling. (Boring to read?
Imagine how boring this is to write. I need writing lessons.)
@@ -95,7 +95,7 @@ the actual build to avoid having to have `root` access.)
WHEN user runs, in foo,
... cleanly --test-mode --ci --buildno 42 --debian-release debian7 deb
- THEN file foo_3.2.ci42-1.debian7_all.deb exists
+ THEN file foo_3.2.0ci42-1.debian7_all.deb exists
Similarly in release builds.
diff --git a/doc/070-pipeline.yarn b/doc/070-pipeline.yarn
index 17c5a4f..037d4a2 100644
--- a/doc/070-pipeline.yarn
+++ b/doc/070-pipeline.yarn
@@ -45,8 +45,10 @@ Then we do the build.
As a result, there's several resulting packages that should exist.
First of all, a CI build for unstable:
- THEN the APT repository for foo.ick contains foo_3.2.ci1-1.unstable.dsc
- THEN the APT repository for foo.ick contains foo_3.2.ci1-1.unstable_all.deb
+ THEN the APT repository for foo.ick contains
+ ... foo_3.2.0ci1-1.unstable.dsc
+ THEN the APT repository for foo.ick contains
+ ... foo_3.2.0ci1-1.unstable_all.deb
We tag a release and build it. Because our test package is
architecture independent, there aren't versions for each architecture