Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
TomPallister committed Nov 24, 2020
1 parent 71a1053 commit 730c940
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "0.38.5",
"version": "0.35.0",
"commands": [
"dotnet-cake"
]
Expand Down
7 changes: 5 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
*/*/bin
*/*/obj
*/*/bin
*/*/obj
tools/
artifacts/
TestResults/
44 changes: 22 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
NAME ?= ocelot

build:
./build.sh

build_and_run_tests:
./build.sh --target=RunTests

release:
./build.sh --target=Release

run_acceptance_tests:
./build.sh --target=RunAcceptanceTests

run_benchmarks:
./build.sh --target=RunBenchmarkTests

run_unit_tests:
./build.sh --target=RunUnitTests

release_notes:
./build.sh --target=ReleaseNotes
NAME ?= ocelot

build:
mono --version

build_and_run_tests:
./build.sh --target=RunTests

release:
./build.sh --target=Release

run_acceptance_tests:
./build.sh --target=RunAcceptanceTests

run_benchmarks:
./build.sh --target=RunBenchmarkTests

run_unit_tests:
./build.sh --target=RunUnitTests

release_notes:
./build.sh --target=ReleaseNotes

6 changes: 3 additions & 3 deletions build.cake
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#tool "nuget:?package=GitVersion.CommandLine&version=5.0.1"
#addin nuget:?package=Cake.Json
#addin nuget:?package=Newtonsoft.Json
#addin nuget:?package=System.Net.Http
#addin nuget:?package=System.Net.Http&version=4.3.4
#addin nuget:?package=System.Text.Encodings.Web&version=4.7.1
#tool "nuget:?package=ReportGenerator"
#tool "nuget:?package=coveralls.net&version=2.0.0"
#addin Cake.Coveralls&version=0.10.2
#tool "nuget:?package=coveralls.net&version=0.7.0"
#addin Cake.Coveralls&version=0.10.1

// compile
var compileConfig = Argument("configuration", "Release");
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dotnet tool install Cake.Tool --version 0.38.5
dotnet tool restore
dotnet cake
5 changes: 3 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
dotnet tool install Cake.Tool --version 0.38.5
dotnet cake
# dotnet tool restore --tool-manifest ./.config/dotnet-tools.json
# echo "tool installed?"
# dotnet cake
2 changes: 1 addition & 1 deletion docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ RUN apt update
RUN apt install -y dirmngr gnupg apt-transport-https ca-certificates software-properties-common
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
RUN apt-add-repository 'deb https://download.mono-project.com/repo/ubuntu stable-focal main'
RUN apt install -y mono-devel
RUN apt install -y mono-complete
RUN apt install -y make
RUN apt install -y build-essential

0 comments on commit 730c940

Please sign in to comment.