Skip to content

Commit d6f6371

Browse files
authored
Merge pull request #9 from Mathavana/develop
Develop - circleci 2.0
2 parents 776a0e7 + 0017aa1 commit d6f6371

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

.circleci/config.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
workflows:
2-
version: 2.1
3-
main:
2+
version: 2
3+
build_and_test:
44
jobs:
5-
- build:
6-
filters:
7-
branches:
8-
only:
9-
- develop
10-
- master
11-
version: 2.1
5+
- build
6+
- test
7+
version: 2
128
jobs:
139
build:
1410
docker:
1511
- image: mcr.microsoft.com/dotnet/core/sdk:2.2
1612
steps:
1713
- checkout
18-
- run:
19-
name: Find
20-
command: find .
2114
- run:
2215
name: Restore
2316
command: dotnet restore ./Supermarket.Core/Supermarket.Core.csproj
24-
- run:
25-
name: Build
26-
command: dotnet build ./Supermarket.Core/Supermarket.Core.csproj
2717
- run:
2818
name: Restore
2919
command: dotnet restore ./Supermarket/Supermarket.csproj
20+
- run:
21+
name: Build
22+
command: dotnet build ./Supermarket.Core/Supermarket.Core.csproj
3023
- run:
3124
name: Build
3225
command: dotnet build ./Supermarket/Supermarket.csproj
26+
test:
27+
docker:
28+
- image: mcr.microsoft.com/dotnet/core/sdk:2.2
29+
steps:
30+
- checkout
3331
- run:
3432
name: Test
3533
command: dotnet test ./Supermarket.UnitTests/Supermarket.UnitTests.csproj

Supermarket/V1/Controllers/AboutController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ public IActionResult Get()
2626
return Ok(new { message = "This is about Api Version 1.0" });
2727
}
2828
}
29-
}
29+
}

0 commit comments

Comments
 (0)