diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:11:46 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:11:46 +0100 |
| commit | 9ed8deb656d9378fc9c1c7fb12c15674b6323ab0 (patch) | |
| tree | 5bc8e7e4182b9e5da99d2a2ba40736f3ac450efe /debian | |
| parent | 3351dfaab0599268eaf25f9d6995ef128910a8b9 (diff) | |
| parent | d87979b48c614dbba4afd1b235307ee354c27719 (diff) | |
| download | mariadb-git-9ed8deb656d9378fc9c1c7fb12c15674b6323ab0.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autobake-deb.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 2b9b87ce23e..7403591b6a0 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -11,6 +11,8 @@ # Exit immediately on any error set -e +source ./VERSION + # This file is invoked from Buildbot and Travis-CI to build deb packages. # As both of those CI systems have many parallel jobs that include different # parts of the test suite, we don't need to run the mysql-test-run at all when @@ -32,7 +34,7 @@ then # Take the files and part of control from MCS directory cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/ echo >> debian/control - cat storage/columnstore/columnstore/debian/control >> debian/control + sed "s/10.6/${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}/" <storage/columnstore/columnstore/debian/control >> debian/control fi # Don't build or try to put files in a package for selected plugins and components on Travis-CI @@ -101,7 +103,6 @@ fi echo "Incrementing changelog and starting build scripts" # Find major.minor version -source ./VERSION UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}" PATCHLEVEL="+maria" LOGSTRING="MariaDB build" |