Prepare the repo for the next development cycle

This commit is contained in:
Rob Kiefer 2018-09-12 08:16:41 -04:00 committed by RobAtticus
parent b1710f16bb
commit c0e68b0d95
5 changed files with 6 additions and 5 deletions

View File

@ -3,7 +3,7 @@ include(CheckCCompilerFlag)
configure_file("version.config" "version.config" COPYONLY)
file(READ version.config VERSION_CONFIG)
set(VERSION_REGEX "version[\t ]*=[\t ]*([0-9]+\\.[0-9]+\\.*[0-9]*)([-]([a-z]+[0-9]*))*\r?\nupdate_from_version[\t ]*=[\t ]*([0-9]+\\.[0-9]+\\.*[0-9]*)(\r?\n)*$")
set(VERSION_REGEX "version[\t ]*=[\t ]*([0-9]+\\.[0-9]+\\.*[0-9]*)([-]([a-z]+[0-9]*))*\r?\nupdate_from_version[\t ]*=[\t ]*([0-9]+\\.[0-9]+\\.*[0-9]*)([-]([a-z]+[0-9]*))*(\r?\n)*$")
if (NOT (${VERSION_CONFIG} MATCHES ${VERSION_REGEX}))
message(FATAL_ERROR "Cannot read version from version.config")

View File

@ -10,7 +10,7 @@
set -e
set -o pipefail
TAGS="0.5.0 0.6.0 0.6.1 0.7.0-pg9.6 0.7.1-pg9.6 0.8.0-pg9.6 0.9.0-pg9.6 0.9.1-pg9.6 0.9.2-pg9.6 0.10.0-pg9.6 0.10.1-pg9.6 0.11.0-pg9.6 0.12.0-pg9.6"
TAGS="0.5.0 0.6.0 0.6.1 0.7.0-pg9.6 0.7.1-pg9.6 0.8.0-pg9.6 0.9.0-pg9.6 0.9.1-pg9.6 0.9.2-pg9.6 0.10.0-pg9.6 0.10.1-pg9.6 0.11.0-pg9.6 0.12.0-pg9.6 1.0.0-rc1-pg9.6"
for tag in ${TAGS};
do

View File

@ -76,6 +76,7 @@ set(MOD_FILES
updates/0.10.1--0.11.0.sql
updates/0.11.0--0.12.0.sql
updates/0.12.0--1.0.0-rc1.sql
updates/1.0.0-rc1--1.0.0-dev.sql
)
set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
@ -132,7 +133,7 @@ cat_files(
add_custom_target(sqlfile ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_FILE})
# Generate the update files used with ALTER EXTENSION <name> UPDATE
set(MOD_FILE_REGEX "([0-9]+\\.[0-9]+\\.*[0-9]*)--([0-9]+\\.[0-9]+\\.*[0-9]+[-a-z0-9]*).sql")
set(MOD_FILE_REGEX "([0-9]+\\.[0-9]+\\.*[0-9]+[-a-z0-9]*)--([0-9]+\\.[0-9]+\\.*[0-9]+[-a-z0-9]*).sql")
# We'd like to process the updates in reverse (descending) order
set(MOD_FILES_LIST ${MOD_FILES_VERSIONED})

View File

View File

@ -1,2 +1,2 @@
version = 1.0.0-rc1
update_from_version = 0.12.0
version = 1.0.0-dev
update_from_version = 1.0.0-rc1