Building only merge commits (#2907)

OrchardCMS · Dec 19, 2018 · 8c500ad · 8c500ad
1 parent f23561e
commit 8c500ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,10 @@ services:
 dist: trusty
 mono: none
 # dotnet: 2.1.300
+branches:
+  only:
+  - master
+  - dev
 env:
   global:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -14,7 +18,7 @@ os:
   - osx
 osx_image: xcode8.3
 script:
-  - curl https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 2.2.100-preview3-009430
+  - curl https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 2.2.101
   - if test "$TRAVIS_OS_NAME" == "linux"; then export PATH="/home/travis/.dotnet":"$PATH"; fi
   - if test "$TRAVIS_OS_NAME" == "osx"; then export PATH="/Users/travis/.dotnet":"$PATH"; fi
   - dotnet --info

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,8 @@
 image: Visual Studio 2017
+
+# Do not build feature branch with open Pull Requests
+skip_branch_with_pr: true
+
 environment:
   global:
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -16,9 +20,8 @@ stack: node 9, docker
 
 # build cache to preserve files/folders between builds
 cache:
-  - node_modules # local npm modules
-  - '%LocalAppData%\NuGet\v3-cache' # NuGet v3
-
+  - node_modules -> **\package.json # local npm modules
+  - '%LocalAppData%\NuGet\v3-cache -> **\*.props' # NuGet v3
 
 # Install scripts. (runs after repo cloning)
 install: