Merge pull request #13471 from jamessan/release-fixes

.github/workflows/release.yml

@@ -20,6 +20,8 @@ jobs:
       release: ${{ steps.build.outputs.release }}
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -44,6 +46,8 @@ jobs:
     runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -67,6 +71,8 @@ jobs:
     runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Install brew packages
         run: |
           brew update >/dev/null

scripts/update_version_stamp.lua

@@ -35,11 +35,10 @@ if not described then
 end
 
 -- `git describe` annotates the most recent tagged release; for pre-release
--- builds we must replace that with the unreleased version.
+-- builds we append that to the dev version
-local with_prefix = described:gsub("^v%d+%.%d+%.%d+", prefix)
+local with_prefix = prefix
-if described == with_prefix then
+if prefix:match('-dev$') ~= nil then
-  -- Prepend the prefix always, e.g. with "nightly-12208-g4041b62b9".
+  with_prefix = prefix .. '+' .. described:gsub('^v%d+%.%d+%.%d+-', '')
-  with_prefix = prefix .. "-" .. described
 end
 
 -- Read existing include file.

src/nvim/CMakeLists.txt

@@ -242,7 +242,7 @@ if(use_git_version)
   add_custom_target(update_version_stamp ALL
     COMMAND ${LUA_PRG} scripts/update_version_stamp.lua
       ${relbuild}/config/auto/versiondef_git.h
-      "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}"
+      "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}${NVIM_VERSION_PRERELEASE}"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     BYPRODUCTS ${CMAKE_BINARY_DIR}/config/auto/versiondef_git.h)
 else()