Ver código fonte

Remove pre-release info

Turns out that get_version and release.sh strategy do not agree
very well on this, which may end up as version comparison problem.

SemVer 2.0 says that pre-release versions go before the associated
versions, that is, 1.0.0-blah goes before 1.0.0, and at the same time
remove the compatibility guarantee.  This means that if pre-releases
are needed, we will probably need to change both PRERELEASE and VERSION,
which is not what was expected when writing release.sh.

For now, the safe thing is to remove PRERELEASE altogether.  If we ever
need to do a pre-release, we will re-verify if it works properly; until
then, build meta-data give us enough luxury.
Alois Mahdal 9 anos atrás
pai
commit
9c94a46bcc
3 arquivos alterados com 6 adições e 1 exclusões
  1. 0
    1
      config.mk
  2. 3
    0
      mkit/include/build.sh
  3. 3
    0
      mkit/include/release.sh

+ 0
- 1
config.mk Ver arquivo

@@ -1,5 +1,4 @@
1 1
 VERSION = 0.6.2
2
-PRERELEASE = devel
3 2
 CODENAME = StopIteration
4 3
 RELSRC = master
5 4
 RELDST = last

+ 3
- 0
mkit/include/build.sh Ver arquivo

@@ -165,6 +165,9 @@ get_version() {
165 165
     #         from tags" fails if we are in shallow clone made from
166 166
     #         other than a tagged commit.
167 167
     #
168
+    # FIXME:  Using PRERELEASE for release IDs may not be compatible with
169
+    #         release strategy implemented in release.sh
170
+    #
168 171
     local version=$VERSION
169 172
     local prerl=$PRERELEASE
170 173
     grep ":" <<<"$prerl" && warn "colon in PRERELEASE may corrupt version data: $prerl"

+ 3
- 0
mkit/include/release.sh Ver arquivo

@@ -23,6 +23,9 @@ __release() {
23 23
     # Span release routines: make a signed tag, check branch
24 24
     # and update release branch
25 25
     #
26
+    # FIXME: Using PRERELEASE as build.sh:get_version() does may not be
27
+    #        compatible with this release strategy
28
+    #
26 29
     local level=$1
27 30
     git rev-parse HEAD >&/dev/null || die "cannot release outside git repo"
28 31
     local lastfile=$(git diff-tree --no-commit-id --name-only -r HEAD)