From 82cc13f183abf9f73a6be5f50569b4c9b2247f7a Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 13 Dec 2022 11:13:15 -0500 Subject: [PATCH] Release version 965 generated by do-release.sh --- citadel/server/citadel.h | 2 +- do-release.sh | 10 +++++++++- libcitadel/lib/libcitadel.h | 2 +- release_version.txt | 2 +- textclient/textclient.h | 2 +- webcit/webcit.h | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h index 9f69109b9..d9594f136 100644 --- a/citadel/server/citadel.h +++ b/citadel/server/citadel.h @@ -25,7 +25,7 @@ extern "C" { #endif -#define REV_LEVEL 964 // This version +#define REV_LEVEL 965 // This version #define REV_MIN 591 // Oldest compatible database #define EXPORT_REV_MIN 931 // Oldest compatible export files #define LIBCITADEL_MIN 951 // Minimum required version of libcitadel diff --git a/do-release.sh b/do-release.sh index f557ca0ef..72d408a8c 100755 --- a/do-release.sh +++ b/do-release.sh @@ -76,6 +76,14 @@ echo -e '' git commit -a -m "Release version ${NEW_VERSION} generated by do-release.sh" git tag -a v${NEW_VERSION} -m "Version ${NEW_VERSION} release" +echo -n 'git push...' +git push +echo + +echo -n 'git push --tags...' +git push --tags +echo + echo -e '' -echo -e '\033[37mFinished. Remember to \033[7mgit push\033[0m and then \033[7mgit push --tags\033[0m' +echo -e '\033[37mFinished.\033[0m' echo -e '' diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 43b615bc1..a1c6e5efd 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -19,7 +19,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 964 +#define LIBCITADEL_VERSION_NUMBER 965 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/release_version.txt b/release_version.txt index 03b7719c6..aa5bea4ec 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -964 +965 diff --git a/textclient/textclient.h b/textclient/textclient.h index d0d215321..ff2ab046c 100644 --- a/textclient/textclient.h +++ b/textclient/textclient.h @@ -11,7 +11,7 @@ #define UDS "_UDS_" #define DEFAULT_HOST "localhost" #define DEFAULT_PORT "504" -#define CLIENT_VERSION 964 +#define CLIENT_VERSION 965 #define CLIENT_TYPE 0 // commands we can send to the stty_ctdl() routine diff --git a/webcit/webcit.h b/webcit/webcit.h index 190ae56fb..b6252814e 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -127,7 +127,7 @@ extern char *ssl_cipher_list; #define PORT_NUM 80 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 964 /* This version of WebCit */ +#define CLIENT_VERSION 965 /* This version of WebCit */ #define MINIMUM_CIT_VERSION 931 /* Minimum required version of Citadel server */ #define LIBCITADEL_MIN 931 /* Minimum required version of libcitadel */ #define DEFAULT_CTDLDIR "/usr/local/citadel" /* Default Citadel server directory */ -- 2.30.2