aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2018-06-06 20:01:03 -0700
committerBo Yang <teboring@google.com>2018-06-06 20:01:03 -0700
commit6249d7f8fdb11886fd88e9f2bcb34dbd0252e57b (patch)
tree98d831645516bc647f662d9fff1f6a8d97b806ff
parent38d98e75043e15e9033d7a36790ba77fdc93f9f9 (diff)
downloadprotobuf-6249d7f8fdb11886fd88e9f2bcb34dbd0252e57b.tar.gz
protobuf-6249d7f8fdb11886fd88e9f2bcb34dbd0252e57b.tar.bz2
protobuf-6249d7f8fdb11886fd88e9f2bcb34dbd0252e57b.zip
Change version to 3.6.0
-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 a5832d2c..c566a0e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
env:
global:
- REPO_DIR=protobuf
- - BUILD_COMMIT=v3.5.2
- - BUILD_VERSION=3.5.2.post1
+ - BUILD_COMMIT=v3.6.0
+ - BUILD_VERSION=3.6.0
- PLAT=x86_64
- UNICODE_WIDTH=32
- MACOSX_DEPLOYMENT_TARGET=10.9
diff --git a/appveyor.yml b/appveyor.yml
index f4835d56..7216c17e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,8 +6,8 @@ environment:
global:
REPO_DIR: protobuf
PACKAGE_NAME: protobuf
- BUILD_COMMIT: v3.5.2
- BUILD_VERSION: 3.5.2.post1
+ BUILD_COMMIT: v3.6.0
+ BUILD_VERSION: 3.6.0
BUILD_DLL: OFF
UNICODE: ON
PB_TEST_DEP: "six==1.9"
diff --git a/config.sh b/config.sh
index 88167b0d..94c45f3a 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.5.2.post1'/" google/protobuf/__init__.py
+ sed -i "s/^__version__.*/__version__ = '3.6.0'/" google/protobuf/__init__.py
fi
cat google/protobuf/__init__.py