Skip to content

Commit

Permalink
Include master in CI (and deploy 'only' on master)
Browse files Browse the repository at this point in the history
Also, linting/formatting CI/CD yml files.
  • Loading branch information
maacpiash committed Jul 24, 2020
1 parent 2f82d53 commit 5efbc8a
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 32 deletions.
29 changes: 15 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@ solution: KonSchool.sln
sudo: required
branches:
only:
- v3.1-mono
- master
- v3.1-mono
jobs:
include:
- os: linux
dist: bionic
- os: osx
osx_image: xcode11.2
- os: linux
dist: bionic
- os: osx
osx_image: xcode11.2
allow_failures:
- os: osx
- os: osx
before_install:
- dotnet --info
- dotnet --info
script:
- dotnet restore
- dotnet build
- dotnet test tests/KonSchool.Tests.csproj
- dotnet restore
- dotnet build
- dotnet test tests/KonSchool.Tests.csproj
global:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
- DOTNET_CLI_TELEMETRY_OPTOUT=1
- ASPNETCORE_ENVIRONMENT=Development
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
- DOTNET_CLI_TELEMETRY_OPTOUT=1
- ASPNETCORE_ENVIRONMENT=Development
deploy:
provider: heroku
api_key:
secure: yg9LRW7QbW02gCubGPe4pOYf0TmkzkYl6j/HUy6Vu3c3zMfriugQtnvid7bDpiHhrLluBk1KK7PYMUsUAYUgzNS8HeOaN8B6F3nLXIZKBiAEJLYBJ4NT6ahTAOqClFstxg/ntzFR6eQ9Ut9Hd2bTZrTMCjd3tMtNQhpEUoqtSidaTEBw0t9FR7BK8Hbrhd6FWb4LmBNwj4FyxaZsUp4xeJlSfYi+BBP0xk3Nr+cS0DI9ApdbLIg/K8rpldby4QcogJT2CXX/8XWeDs1zwkDdThG7SJkLcganVGiMzKn/EBf2oxiPsP2FNab5d0x4V0IpdyeGAirnvAso3t8BhpXR11X/13hgvMR3vdaIBWVSHSHLsvlOnKeKFIq5bprLxKqzAlaE4ZS6a9OLGFC8mP+gOADssKEMTVMi2cIULaIy2/x+bV2KeZAvDTKovIUuLi3clkxq2vwh12w2mLwaEknF6Itln3iXyyrKCsIrpClGP+D4lhwlST1RKAzaHmzyuP0pY8k7KwsVKWgvYstbavyMlpJo36vyHSz4nnZqgMPNlZEYAxpf0+fvI+lPzIgDAPwZzcwhTJB+7QEO7SOwuarSCZJwNUGYMZU7jgq6KO+KhqE7TZzZRJzMpZKpfx1ZjBY4wwWSG2RAkm0xsO+H/pieK0PGQ8ZY0FR+T+3iua+ta28=
app: konschool
on:
branch: v3.1-mono
branch: master
39 changes: 21 additions & 18 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
version: '1.0.{build}'
version: "1.0.{build}"
image: Visual Studio 2019
branches:
only:
- v3.1-mono
- master
- v3.1-mono

init:
- git config --global core.autocrlf true
- git config --global core.autocrlf true

before_build:
- dotnet --info
- choco install codecov
- dotnet tool install --global coverlet.console
- dotnet restore
- dotnet --info
- choco install codecov
- dotnet tool install --global coverlet.console
- dotnet restore

build:
project: KonSchool.sln
verbosity: minimal
publish_wap: true

build_script:
- dotnet build
- dotnet build

after_build:
- cmd: dotnet publish src\KonSchool.csproj --output %APPVEYOR_BUILD_FOLDER%\dist
Expand All @@ -28,15 +29,17 @@ artifacts:
- path: dist

test_script:
- coverlet tests/bin/Debug/netcoreapp3.1/KonSchool.Tests.dll --target "dotnet" --targetargs "test tests/KonSchool.Tests.csproj --no-build" --format opencover
- codecov -f "coverage.opencover.xml" -t %CODECOV_TOKEN%
- coverlet tests/bin/Debug/netcoreapp3.1/KonSchool.Tests.dll --target "dotnet" --targetargs "test tests/KonSchool.Tests.csproj --no-build" --format opencover
- codecov -f "coverage.opencover.xml" -t %CODECOV_TOKEN%

deploy:
provider: WebDeploy
server: https://konschool.scm.azurewebsites.net:443/msdeploy.axd?site=KonSchool
website: KonSchool
username: $KonSchool
password:
secure: 1kfpmAnJMc699Y32qORP2BtyaMmdmHxVdZATVRHNV24pxDlz7MjGMzHYDwo0i9Odgw+UGJVZfzr6X+h67I1aWw==
ntlm: false
remove_files: false
- provider: WebDeploy
server: https://konschool.scm.azurewebsites.net:443/msdeploy.axd?site=KonSchool
website: KonSchool
username: $KonSchool
password:
secure: 1kfpmAnJMc699Y32qORP2BtyaMmdmHxVdZATVRHNV24pxDlz7MjGMzHYDwo0i9Odgw+UGJVZfzr6X+h67I1aWw==
ntlm: false
remove_files: false
on:
branch: master

0 comments on commit 5efbc8a

Please sign in to comment.