Re: [FFmpeg-devel] [PATCH 0/2] New versioning (was: version.sh: Always use latest tag for generated version number)

[Hendrik Leppkes]

On Sun, Mar 6, 2016 at 2:50 AM, Timothy Gu  wrote:
> This patch set implements the versioning algorithm I recently proposed.
> The first patch addresses an already existing problem with version.sh.
> The second is the one actually implementing the change.
>
> To Michael and all release makers: after this patchset when making a
> release in a release branch, please do ALL of the following in the
> following order.
>
> 1. cp RELEASE VERSION
> 2. git add VERSION
> 3. Update doc/Doxyfile and Changelog
> 4. git commit -a -m "Update for $(cat VERSION)"
> 5. git tag -a -m "Release $(cat VERSION)"
> 6. Edit RELEASE to make it contain next version
> 7. git rm VERSION
> 8. git commit -a -m "Next release is $(cat RELEASE)"
>

This process seems rather convoluted, with adding and removing files
and whatnot. Easy to screw up and impossible to remedy later.
Can't we simplify that somehow to only use the tag, and not any
temporary VERSION file?

- Hendrik
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 0/2] New versioning (was: version.sh: Always use latest tag for generated version number)

[Carl Eugen Hoyos]

Timothy Gu  gmail.com> writes:

> Timothy Gu (2):
>   version.sh: Fix Git directory
>   version.sh: Add next release to the version

Without these patches applied, I get the following:
$ ./version.sh
N-78949-g6f5048f

With your patches applied, I see:
$ ./version.sh
cat: /RELEASE: No such file or directory
-dev
$ cat RELEASE
n3.1-master

So I believe this is not correct yet.

Carl Eugen

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 0/2] New versioning (was: version.sh: Always use latest tag for generated version number)

[Reimar Döffinger]

On 06.03.2016, at 02:50, Timothy Gu  wrote:
> To Michael and all release makers: after this patchset when making a
> release in a release branch, please do ALL of the following in the
> following order.

Been absent a while from the list, but this sounds like we do not have
documentation on the release process?
Might be a good idea to add one then.
Apart from that it would be nicer if we didn't need both RELEASE and VERSION 
files, in particular avoid constantly adding and removing them which breaks git 
log on them...
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 0/2] New versioning (was: version.sh: Always use latest tag for generated version number)

[Timothy Gu]

This patch set implements the versioning algorithm I recently proposed.
The first patch addresses an already existing problem with version.sh.
The second is the one actually implementing the change.

To Michael and all release makers: after this patchset when making a
release in a release branch, please do ALL of the following in the
following order.

1. cp RELEASE VERSION
2. git add VERSION
3. Update doc/Doxyfile and Changelog
4. git commit -a -m "Update for $(cat VERSION)"
5. git tag -a -m "Release $(cat VERSION)"
6. Edit RELEASE to make it contain next version
7. git rm VERSION
8. git commit -a -m "Next release is $(cat RELEASE)"

The differences to before is that, first, rather than updating RELEASE
right before a release, it must be updated after the release is made;
second, VERSION must be checked in at the tag, and removed immediately
after the release is made.

When a release branch is cut, do the following

1. Remove "-master" in RELEASE
2. git commit -a -m "Next release is $(cat RELEASE)"

Timothy Gu (2):
  version.sh: Fix Git directory
  version.sh: Add next release to the version

 RELEASE|  2 +-
 version.sh | 54 ++
 2 files changed, 35 insertions(+), 21 deletions(-)

--
1.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel