diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-12-06 22:31:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 22:31:30 -0500 |
| commit | ee5ece084cf76fc90f0bd3aa4e0ddeaaca0bc51a (patch) | |
| tree | 4f72cb8a48460dded135d6678483a8aa1a6bdf78 | |
| parent | 7477703586af3710584888b197d84a0938a27fe9 (diff) | |
| parent | b32124fce260f1132dcda7699905613bea2e888f (diff) | |
| download | rneovim-ee5ece084cf76fc90f0bd3aa4e0ddeaaca0bc51a.tar.gz rneovim-ee5ece084cf76fc90f0bd3aa4e0ddeaaca0bc51a.tar.bz2 rneovim-ee5ece084cf76fc90f0bd3aa4e0ddeaaca0bc51a.zip | |
Merge pull request #13471 from jamessan/release-fixes
| -rw-r--r-- | .github/workflows/release.yml | 6 | ||||
| -rwxr-xr-x | scripts/update_version_stamp.lua | 9 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 610d62211a..2acd615da1 100644 --- a/.github/workflows/release.yml +++ b/.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 diff --git a/scripts/update_version_stamp.lua b/scripts/update_version_stamp.lua index 11b521fab6..0342e08f31 100755 --- a/scripts/update_version_stamp.lua +++ b/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. -local with_prefix = described:gsub("^v%d+%.%d+%.%d+", prefix) -if described == with_prefix then - -- Prepend the prefix always, e.g. with "nightly-12208-g4041b62b9". - with_prefix = prefix .. "-" .. described +-- builds we append that to the dev version +local with_prefix = prefix +if prefix:match('-dev$') ~= nil then + with_prefix = prefix .. '+' .. described:gsub('^v%d+%.%d+%.%d+-', '') end -- Read existing include file. diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 8ec087c626..db77931c16 100644 --- a/src/nvim/CMakeLists.txt +++ b/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() |