huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-03-02 14:27:00 -08:00
parent 0f6ba66e46 d78e7ea80d
commit aa0ec53f76
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.appveyor.yml
View File

@ -2,12 +2,9 @@ init:
- git config --global core.autocrlf true
branches:
only:
- master
- release
- dev
- feature/dev-si
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
- /^rel\/.*/
build_script:
- ps: .\run.ps1 default-build
clone_depth: 1
@ -15,6 +12,6 @@ environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
test: off
deploy: off
test: 'off'
deploy: 'off'
os: Visual Studio 2017

12
.travis.yml
View File

@ -18,14 +18,14 @@ os:
osx_image: xcode8.2
branches:
only:
- master
- release
- dev
- feature/dev-si
- /^release\/.*$/
- /^(.*\/)?ci-.*$/
- /^rel\/.*/
before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
/usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
/usr/local/lib/; fi
script:
- ./build.sh
- if test "$TRAVIS_OS_NAME" != "osx"; then bash test/SystemdActivation/docker.sh; fi
- if test "$TRAVIS_OS_NAME" != "osx"; then bash test/SystemdActivation/docker.sh;
fi