Skip to content

Commit

Permalink
use make instead of lots of files
Browse files Browse the repository at this point in the history
  • Loading branch information
TomPallister committed Jan 13, 2020
1 parent fe60a97 commit ec7f0de
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ jobs:
- image: mijitt0m/ocelot-build:0.0.1
steps:
- checkout
- run: ./build.sh
- run: make build
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ COPY ./. .

RUN chmod u+x build.sh

RUN /bin/bash -c "/src/build.sh"
RUN make build
22 changes: 22 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions build-and-release-unstable.ps1

This file was deleted.

2 changes: 0 additions & 2 deletions build-and-run-tests.ps1

This file was deleted.

2 changes: 0 additions & 2 deletions docs/building/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://semver.org/>`_ 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.
Expand Down
2 changes: 0 additions & 2 deletions release.ps1

This file was deleted.

2 changes: 0 additions & 2 deletions run-acceptance-tests.ps1

This file was deleted.

3 changes: 0 additions & 3 deletions run-acceptance-tests.sh

This file was deleted.

2 changes: 0 additions & 2 deletions run-benchmarks.ps1

This file was deleted.

2 changes: 0 additions & 2 deletions run-unit-tests.ps1

This file was deleted.

3 changes: 0 additions & 3 deletions run-unit-tests.sh

This file was deleted.

1 change: 0 additions & 1 deletion version.ps1

This file was deleted.

0 comments on commit ec7f0de

Please sign in to comment.