aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2018-08-02 17:49:41 -0700
committerBo Yang <teboring@google.com>2018-08-02 17:49:41 -0700
commit8205c14e416dbddfef781a3c9ff60c0ae84ffe76 (patch)
treee5d9bee13858acaaa320df548ccf92828f3b3d23
parent06e415afe458aab41f53650a9ac089cbcb70987c (diff)
downloadprotobuf-8205c14e416dbddfef781a3c9ff60c0ae84ffe76.tar.gz
protobuf-8205c14e416dbddfef781a3c9ff60c0ae84ffe76.tar.bz2
protobuf-8205c14e416dbddfef781a3c9ff60c0ae84ffe76.zip
Update version to 3.6.1
-rw-r--r--.travis.yml4
-rw-r--r--appveyor.yml4
-rw-r--r--config.sh2
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index c566a0e2..eb72d8a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
env:
global:
- REPO_DIR=protobuf
- - BUILD_COMMIT=v3.6.0
- - BUILD_VERSION=3.6.0
+ - BUILD_COMMIT=v3.6.1
+ - BUILD_VERSION=3.6.1
- PLAT=x86_64
- UNICODE_WIDTH=32
- MACOSX_DEPLOYMENT_TARGET=10.9
diff --git a/appveyor.yml b/appveyor.yml
index 2a940d7c..02a35cb9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,8 +6,8 @@ environment:
global:
REPO_DIR: protobuf
PACKAGE_NAME: protobuf
- BUILD_COMMIT: v3.6.0
- BUILD_VERSION: 3.6.0
+ BUILD_COMMIT: v3.6.1
+ BUILD_VERSION: 3.6.1
BUILD_DLL: OFF
UNICODE: ON
PB_TEST_DEP: "six==1.9"
diff --git a/config.sh b/config.sh
index 94c45f3a..7641a3a1 100644
--- a/config.sh
+++ b/config.sh
@@ -38,7 +38,7 @@ function bdist_wheel_cmd {
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
sed -i.bu "s/^__version__.*/__version__ = '$BUILD_VERSION'/" google/protobuf/__init__.py
else
- sed -i "s/^__version__.*/__version__ = '3.6.0'/" google/protobuf/__init__.py
+ sed -i "s/^__version__.*/__version__ = '3.6.1'/" google/protobuf/__init__.py
fi
cat google/protobuf/__init__.py