Skip to content

Commit

Permalink
Support/healthcheck (#22)
Browse files Browse the repository at this point in the history
* remove unused

* run build on branch

* fix CI?

* fix
  • Loading branch information
framebassman committed Jun 17, 2020
1 parent da88f83 commit e9ac424
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 55 deletions.
50 changes: 28 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
jobs:
include:
# - stage: Build
# language: csharp
# dist: xenial
# mono: none
# dotnet: 3.1
# install:
# - dotnet clean
# - dotnet restore
# script:
# - dotnet build
- stage: Build
language: csharp
dist: xenial
mono: none
dotnet: 3.1
install:
- dotnet clean
- dotnet restore
script:
- dotnet build

- stage: test
- stage: Unit tests
language: node_js
node_js:
- 12.15.0
before_install:
- cd Chat.Web/Client/
install:
- npm install
script:
- npm test

- stage: Integration tests
language: csharp
mono: none
dotnet: 3.1
Expand All @@ -27,16 +38,6 @@ jobs:
- bash Scripts/wait-until-service-is-up.sh
- xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1024x768x24" dotnet test Chat.Tests.Integration

# - language: node_js
# node_js:
# - 12.15.0
# before_install:
# - cd Chat.Web/Client/
# install:
# - npm install
# script:
# - npm test

- stage: Deploy
language: minimal
services:
Expand All @@ -57,7 +58,12 @@ jobs:
skip_cleanup: true

stages:
- Test
- name: Build
if: type != pull_request
- name: Unit tests
if: type != pull_request
- name: Integration tests
if: type = pull_request
- name: Deploy
if: branch = master AND type != pull_request
branches:
Expand Down
33 changes: 0 additions & 33 deletions Chat.Web/Middlewares/HealthCheckMiddleware.cs

This file was deleted.

0 comments on commit e9ac424

Please sign in to comment.