using a different version in master branch, compared with release (#1676

) * using different version for master branch with release * Update .travis.yml * Update .travis.yml
microsoft · Sep 20, 2018 · 425503d · 425503d
1 parent ed92296
commit 425503d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.0.{build}
+version: 2.2.1.{build}
 
 image: Visual Studio 2015
 platform: x64

diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,6 @@ os:
 
 env:
   global:  # default values
-    - COMPILER=clang
     - PYTHON_VERSION=3.7
   matrix:
     - TASK=regular PYTHON_VERSION=3.6
@@ -42,8 +41,10 @@ before_install:
   - export BUILD_DIRECTORY="$TRAVIS_BUILD_DIR"
   - if [[ $TRAVIS_OS_NAME == "osx" ]]; then
         export OS_NAME="macos";
+        export COMPILER="gcc";
     else
         export OS_NAME="linux";
+        export COMPILER="clang";
     fi
   - export PATH="$HOME/miniconda/bin:$PATH"
   - export CONDA_ENV="test-env"

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -62,7 +62,7 @@ phases:
 - phase: MacOS
 ###########################################
   variables:
-    COMPILER: gcc
+    COMPILER: clang
   queue:
     name: 'Hosted macOS Preview'
     parallel: 3

diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: lightgbm
 Type: Package
 Title: Light Gradient Boosting Machine
-Version: 2.2.0
-Date: 2018-09-17
+Version: 2.2.1
+Date: 2018-09-18
 Authors@R: c(
 	person("Guolin", "Ke", email = "guolin.ke@microsoft.com", role = c("aut", "cre")),
 	person("Damien", "Soukhavong", email = "damien.soukhavong@skema.edu", role = c("ctb")),

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-2.2.0
+2.2.1