From 4e6e71d337a4dcf46d7361d03c0ba0b354759a39 Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Wed, 30 Oct 2024 22:46:07 -0400 Subject: [PATCH] Increase the version to 11.0 (#7065) Increases the current version and the oldest compatible version to 11.0. --- .github/workflows/ci-docs.yml | 2 +- .github/workflows/ci-package.yml | 12 ++++++------ CMakeLists.txt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 57a134e79d5..cdf98e4a30c 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -90,7 +90,7 @@ jobs: # We only use a non-zero build # when making multiple manual builds in one day. run: | if test -z "${{ github.event.inputs.version }}"; then - export VERSION_NUMBER=10.94.$((`git log -n 1 --format=%ct` / (60*60*24))) + export VERSION_NUMBER=11.0.$((`git log -n 1 --format=%ct` / (60*60*24))) else export VERSION_NUMBER=${{ github.event.inputs.version }} fi diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml index 3df7e7c2388..c1f8481c4ae 100644 --- a/.github/workflows/ci-package.yml +++ b/.github/workflows/ci-package.yml @@ -103,7 +103,7 @@ jobs: # We only use a non-zero build # when making multiple manual builds in one day. run: | if test -z "${{ github.event.inputs.version }}"; then - export VERSION_NUMBER=10.94.$((`git log -n 1 --format=%ct` / (60*60*24))) + export VERSION_NUMBER=11.0.$((`git log -n 1 --format=%ct` / (60*60*24))) else export VERSION_NUMBER=${{ github.event.inputs.version }} fi @@ -196,7 +196,7 @@ jobs: # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt. run: | if test -z "${{ github.event.inputs.version }}"; then - export VERSION_NUMBER=10.94.$((`git log -n 1 --format=%ct` / (60*60*24))) + export VERSION_NUMBER=11.0.$((`git log -n 1 --format=%ct` / (60*60*24))) else export VERSION_NUMBER=${{ github.event.inputs.version }} fi @@ -285,7 +285,7 @@ jobs: # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt. run: | if test -z "${{ github.event.inputs.version }}"; then - export VERSION_NUMBER=10.94.$((`git log -n 1 --format=%ct` / (60*60*24))) + export VERSION_NUMBER=11.0.$((`git log -n 1 --format=%ct` / (60*60*24))) else export VERSION_NUMBER=${{ github.event.inputs.version }} fi @@ -374,7 +374,7 @@ jobs: # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt. run: | if test -z "${{ github.event.inputs.version }}"; then - export VERSION_NUMBER=10.94.$((`git log -n 1 --format=%ct` / (60*60*24))) + export VERSION_NUMBER=11.0.$((`git log -n 1 --format=%ct` / (60*60*24))) else export VERSION_NUMBER=${{ github.event.inputs.version }} fi @@ -457,7 +457,7 @@ jobs: # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt. run: | if test -z "${{ github.event.inputs.version }}"; then - export VERSION_NUMBER=10.94.$((`git log -n 1 --format=%ct` / (60*60*24))) + export VERSION_NUMBER=11.0.$((`git log -n 1 --format=%ct` / (60*60*24))) else export VERSION_NUMBER=${{ github.event.inputs.version }} fi @@ -541,7 +541,7 @@ jobs: # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt. run: | if test -z "${{ github.event.inputs.version }}"; then - export VERSION_NUMBER="10.93.$((`git log -n 1 --format=%ct` / (60*60*24)))" + export VERSION_NUMBER="11.0.$((`git log -n 1 --format=%ct` / (60*60*24)))" export PREFIX="cronbuild-" else export VERSION_NUMBER=${{ github.event.inputs.version }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 88f32edc9ce..a3e2143078f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -575,7 +575,7 @@ endif (EXISTS "${PROJECT_SOURCE_DIR}/.svn") # N.B.: When updating this, update all the default versions in ci-package.yml # and ci-docs.yml. We should find a way to share (xref i#1565). -set(VERSION_NUMBER_DEFAULT "10.94.${VERSION_NUMBER_PATCHLEVEL}") +set(VERSION_NUMBER_DEFAULT "11.0.${VERSION_NUMBER_PATCHLEVEL}") # do not store the default VERSION_NUMBER in the cache to prevent a stale one # from preventing future version updates in a pre-existing build dir set(VERSION_NUMBER "" CACHE STRING "Version number: leave empty for default") @@ -1397,7 +1397,7 @@ math(EXPR VERSION_NUMBER_INTEGER "${VERSION_NUMBER_MAJOR}*100 + ${VERSION_NUMBER_MINOR}") # Every release since has had minor compat breakages: see api/docs/release.dox. -set(OLDEST_COMPATIBLE_VERSION_DEFAULT "1000") +set(OLDEST_COMPATIBLE_VERSION_DEFAULT "1100") set(OLDEST_COMPATIBLE_VERSION "" CACHE STRING "Oldest compatible version: leave empty for default") if ("${OLDEST_COMPATIBLE_VERSION}" STREQUAL "")