From 0239509439e60963fdc6285cd340c79ab53889c5 Mon Sep 17 00:00:00 2001 From: jfreegman Date: Fri, 24 Dec 2021 14:21:26 -0500 Subject: [PATCH] Bump version to 0.11.3 and update toxcore version in static build script --- .cirrus.yml | 2 +- apidoc/python/source/conf.py | 6 +++--- cfg/global_vars.mk | 2 +- script/build-minimal-static-toxic.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9813fb9..503439e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,7 @@ --- cirrus-ci_task: container: - image: toxchat/toktok-stack:0.0.28-third_party + image: toxchat/toktok-stack:0.0.31-third_party cpu: 2 memory: 2G configure_script: diff --git a/apidoc/python/source/conf.py b/apidoc/python/source/conf.py index fcfcd51..7502546 100644 --- a/apidoc/python/source/conf.py +++ b/apidoc/python/source/conf.py @@ -55,9 +55,9 @@ author = 'Jakob Kreuze' # built documents. # # The short X.Y version. -version = '0.11.2' +version = '0.11.3' # The full version, including alpha/beta/rc tags. -release = '0.11.2' +release = '0.11.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -151,4 +151,4 @@ texinfo_documents = [ (master_doc, 'toxic_api', 'toxic_api Documentation', author, 'toxic_api', 'One line description of project.', 'Miscellaneous'), -] \ No newline at end of file +] diff --git a/cfg/global_vars.mk b/cfg/global_vars.mk index 5ccbe54..802aa3e 100644 --- a/cfg/global_vars.mk +++ b/cfg/global_vars.mk @@ -1,5 +1,5 @@ # Version -TOXIC_VERSION = 0.11.2 +TOXIC_VERSION = 0.11.3 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error") ifneq (, $(findstring error, $(REV))) VERSION = $(TOXIC_VERSION) diff --git a/script/build-minimal-static-toxic.sh b/script/build-minimal-static-toxic.sh index 1e5598f..649ae10 100755 --- a/script/build-minimal-static-toxic.sh +++ b/script/build-minimal-static-toxic.sh @@ -132,10 +132,10 @@ mkdir -p "$BUILD_DIR" cd "$BUILD_DIR" # The git hash of the c-toxcore version we're using -TOXCORE_VERSION="af1848ed13d2aa3a7fc218de1d0633e99814efec" +TOXCORE_VERSION="v0.2.13" # The sha256sum of the c-toxcore tarball for TOXCORE_VERSION -TOXCORE_HASH="acd1117b752583eb7d97aabc1053275ffa5f92591e166687a17c7267201a2e18" +TOXCORE_HASH="67114fa57504c58b695f5dce8ef85124d555f2c3c353d0d2615e6d4845114ab8" TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"