git-version-gen: allow 'snapshot' as .tarball-version contents

git-version-gen: allow 'snapshot' as .tarball-version contents

[Bruno Haible]

Hi,

git-version-gen currently rejects some forms of .tarball-version:

$ cat > .tarball-version
20191011
$ build-aux/git-version-gen .tarball-version; echo
20191011
$ cat > .tarball-version
snapshot
$ build-aux/git-version-gen .tarball-version; echo
build-aux/git-version-gen: WARNING: .tarball-version is missing or damaged
UNKNOWN

I need a non-numeric version for continuous publishing of gettext snapshot
tarballs, and I want the tarballs to be called gettext-snapshot.tar.gz,
not gettext-UNKNOWN.tar.gz.

This patch fixes the problem.


2019-10-13  Bruno Haible  <bruno@clisp.org>

	git-version-gen: Allow 'snapshot' as .tarball-version contents.
	* build-aux/git-version-gen: Don't map non-numeric .tarball-version
	contents to the empty string.

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 45b5656..d855645 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -142,11 +142,9 @@ then
     v=`cat $tarball_version_file` || v=
     case $v in
         *$nl*) v= ;; # reject multi-line output
-        [0-9]*) ;;
-        *) v= ;;
     esac
     test "x$v" = x \
-        && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
+        && echo "$0: WARNING: $tarball_version_file is damaged" 1>&2
 fi
 
 if test "x$v" != x

Re: git-version-gen: allow 'snapshot' as .tarball-version contents

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 727 bytes --]

Hi,

On Sun, Oct 13, 2019 at 06:30:47PM +0200, Bruno Haible wrote:
> Hi,
> 
> git-version-gen currently rejects some forms of .tarball-version:
> 
> $ cat > .tarball-version
> 20191011
> $ build-aux/git-version-gen .tarball-version; echo
> 20191011
> $ cat > .tarball-version
> snapshot
> $ build-aux/git-version-gen .tarball-version; echo
> build-aux/git-version-gen: WARNING: .tarball-version is missing or damaged
> UNKNOWN
> 
> I need a non-numeric version for continuous publishing of gettext snapshot
> tarballs, and I want the tarballs to be called gettext-snapshot.tar.gz,

I wonder how users of these tarballs would be able to identify
snapshots if there is no version information.


-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: git-version-gen: allow 'snapshot' as .tarball-version contents

[Bruno Haible]

Dmitry V. Levin wrote:
> > I need a non-numeric version for continuous publishing of gettext snapshot
> > tarballs, and I want the tarballs to be called gettext-snapshot.tar.gz,
> 
> I wonder how users of these tarballs would be able to identify
> snapshots if there is no version information.

They can remember the date at which they downloaded the snapshot.

Ideally a download would have a stable URL _and_ a version number. In some
cases, this is not possible or extra effort. I find that for CI tarballs a
stable URL is the more important feature.

Bruno

Re: git-version-gen: allow 'snapshot' as .tarball-version contents

[Assaf Gordon]

Hello Bruno,

On 2019-10-13 3:18 p.m., Bruno Haible wrote:
> Dmitry V. Levin wrote:
>>> I need a non-numeric version for continuous publishing of gettext snapshot
>>> tarballs, and I want the tarballs to be called gettext-snapshot.tar.gz,
>>
>> I wonder how users of these tarballs would be able to identify
>> snapshots if there is no version information.
> 
> I find that for CI tarballs a
> stable URL is the more important feature.
> 

Somewhat related:

If you're posting the tarballs to ftp.gnu.org or alpha.gnu.org ,
the upload script (build-aux/gnupload) can create symlinks,
and even provide examples of symlinking a "-latest.tar.gz" to a 
versioned one:
----
$ gnupload --help
[...]
4. Create a symbolic link foobar-latest.tar.gz -> foobar-1.0.tar.gz
    and likewise for the corresponding .sig file:
   gnupload --to ftp.gnu.org:foobar \
            --symlink foobar-1.0.tar.gz     foobar-latest.tar.gz \
                      foobar-1.0.tar.gz.sig foobar-latest.tar.gz.sig
----

Would that help with a stable URL for testing?

Re: git-version-gen: allow 'snapshot' as .tarball-version contents

[Bruno Haible]

Hello Assaf,

> >> I wonder how users of these tarballs would be able to identify
> >> snapshots if there is no version information.
> > 
> > I find that for CI tarballs a
> > stable URL is the more important feature.
> > 
> 
> Somewhat related:
> 
> If you're posting the tarballs to ftp.gnu.org or alpha.gnu.org ,
> the upload script (build-aux/gnupload) can create symlinks,
> and even provide examples of symlinking a "-latest.tar.gz" to a 
> versioned one:
> ----
> $ gnupload --help
> [...]
> 4. Create a symbolic link foobar-latest.tar.gz -> foobar-1.0.tar.gz
>     and likewise for the corresponding .sig file:
>    gnupload --to ftp.gnu.org:foobar \
>             --symlink foobar-1.0.tar.gz     foobar-latest.tar.gz \
>                       foobar-1.0.tar.gz.sig foobar-latest.tar.gz.sig
> ----
> 
> Would that help with a stable URL for testing?

Yes, symlinks like this solve the problem.

However, the continuous integration happens on non-GNU machines, and
I'm not sure I would want to upload the secret part of my (or anyone else's)
GPG key to a cloud platform, for security reasons. It could/would compromise
the trust people have in the gnu-keyring.gpg.

Bruno