diff --git a/.circleci/config.yml b/.circleci/config.yml index 15682f1a..873e6d5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,4 +5,4 @@ jobs: - image: mijitt0m/ocelot-build:0.0.1 steps: - checkout - - run: ./build.sh \ No newline at end of file + - run: make build \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 99654887..d44d7640 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ COPY ./. . RUN chmod u+x build.sh -RUN /bin/bash -c "/src/build.sh" \ No newline at end of file +RUN make build \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..134efef0 --- /dev/null +++ b/Makefile @@ -0,0 +1,22 @@ +NAME ?= ocelot + +build: + ./build.sh + +build_and_release_unstable: + ./build.ps1 -target BuildAndReleaseUnstable && exit $LASTEXITCODE + +build_and_run_tests: + ./build.ps1 -target RunTests && exit $LASTEXITCODE + +release: + ./build.ps1 -target Release && exit $LASTEXITCODE + +run_acceptance_tests: + ./build -target RunAcceptanceTests && exit $LASTEXITCODE + +run_benchmarks: + ./build.ps1 -target RunBenchmarkTests && exit $LASTEXITCODE + +run_unit_tests: + ./build.ps1 -target RunUnitTests && exit $LASTEXITCODE diff --git a/build-and-release-unstable.ps1 b/build-and-release-unstable.ps1 deleted file mode 100644 index 269a8689..00000000 --- a/build-and-release-unstable.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -./build.ps1 -target BuildAndReleaseUnstable -exit $LASTEXITCODE \ No newline at end of file diff --git a/build-and-run-tests.ps1 b/build-and-run-tests.ps1 deleted file mode 100644 index 6ff61c0a..00000000 --- a/build-and-run-tests.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -./build.ps1 -target RunTests -exit $LASTEXITCODE \ No newline at end of file diff --git a/docs/building/building.rst b/docs/building/building.rst index 8fbd37b9..a792ee95 100644 --- a/docs/building/building.rst +++ b/docs/building/building.rst @@ -3,8 +3,6 @@ Building * You'll generally want to run the `./build.ps1` script. This will compile, run unit and acceptance tests and build the output packages locally. Output will got to the `./artifacts` directory. -* You can view the current commit's `SemVer `_ build information by running `./version.ps1`. - * The other `./*.ps1` scripts perform subsets of the build process, if you don't want to run the full build. * The release process works best with GitFlow branching; this allows us to publish every development commit to an unstable feed with a unique SemVer version, and then choose when to release to a stable feed. diff --git a/release.ps1 b/release.ps1 deleted file mode 100644 index c396b570..00000000 --- a/release.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -./build.ps1 -target Release -exit $LASTEXITCODE \ No newline at end of file diff --git a/run-acceptance-tests.ps1 b/run-acceptance-tests.ps1 deleted file mode 100644 index 8f6b2dc2..00000000 --- a/run-acceptance-tests.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -./build -target RunAcceptanceTests -exit $LASTEXITCODE \ No newline at end of file diff --git a/run-acceptance-tests.sh b/run-acceptance-tests.sh deleted file mode 100755 index e05baea1..00000000 --- a/run-acceptance-tests.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -./build.sh --target RunAcceptanceTests \ No newline at end of file diff --git a/run-benchmarks.ps1 b/run-benchmarks.ps1 deleted file mode 100644 index 790ce6c6..00000000 --- a/run-benchmarks.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -./build.ps1 -target RunBenchmarkTests -exit $LASTEXITCODE \ No newline at end of file diff --git a/run-unit-tests.ps1 b/run-unit-tests.ps1 deleted file mode 100644 index 444f0c46..00000000 --- a/run-unit-tests.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -./build.ps1 -target RunUnitTests -exit $LASTEXITCODE \ No newline at end of file diff --git a/run-unit-tests.sh b/run-unit-tests.sh deleted file mode 100755 index da848514..00000000 --- a/run-unit-tests.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -./build.sh --target RunUnitTests \ No newline at end of file diff --git a/version.ps1 b/version.ps1 deleted file mode 100644 index 621201b6..00000000 --- a/version.ps1 +++ /dev/null @@ -1 +0,0 @@ -.\tools\GitVersion.CommandLine\tools\GitVersion.exe \ No newline at end of file