curtin-dev team mailing list archive

[Ryan Harper <ryan.harper@xxxxxxxxxxxxx>]

Note that, when new-upstream-snapshot runs git describe, this returns 19.3-XX ... but this really should be 20.1 release.

So, I manually edited new-upstream-snapshot to add the --tags flag ... This produced the output I expected for uploading the new-release into groovy.

% git diff
diff --git a/scripts/new-upstream-snapshot b/scripts/new-upstream-snapshot
index 5586a535..e89e2569 100755
--- a/scripts/new-upstream-snapshot
+++ b/scripts/new-upstream-snapshot
@@ -260,7 +260,7 @@ main() {
     prev_pkg_hash=${t##*-g}
 
     new_pkg_debian="0ubuntu1"
-    new_upstream_ver=$(git describe --abbrev=8 "${from_ref}")
+    new_upstream_ver=$(git describe --tags --abbrev=8 "${from_ref}")
     upstream_hash=$(git rev-parse --short=8 "${from_ref}")
     new_pkg_ver="${new_upstream_ver}-${new_pkg_debian}${sru_ver_suff}"


That said, if there was a better way to get git describe to spit out that it was 20.1 tagged release, then we should document that in the ubuntu-release-process under a section about uploading a new release.
-- 
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/384582
Your team curtin developers is requested to review the proposed merge of ~raharper/curtin:ubuntu-devel-new-upstream-snapshot-20200526 into curtin:ubuntu/devel.