diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 654981f5c7..8084945554 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,4 +35,4 @@ jobs: run: brew install webp - name: Build & test - run: go build . && go test ./... + run: make build && make test diff --git a/.gitignore b/.gitignore index 7748208377..f39638f188 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ examples/*.webp examples/*.gif # Pixlet Binary -build/out/pixlet +pixlet diff --git a/BUILD.md b/BUILD.md index 5777868008..ae749b6585 100644 --- a/BUILD.md +++ b/BUILD.md @@ -17,9 +17,9 @@ Steps ```console cd pixlet ``` -- Build the following directories in order: `/render`, then `/runtime`, then `/encode` and finally `/`: +- Build the binary: ```console - go build render runtime encode . + make build ``` - After that you will have the binary `/pixlet`, which you should copy to your path. diff --git a/Makefile b/Makefile index 248c1b8fe6..dab427d71b 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ test: go test -v -cover ./... clean: - rm -rf build/out + rm -f pixlet bench: go test -benchmem -benchtime=20s -bench BenchmarkRunAndRender tidbyt.dev/pixlet/encode -build: clean embedfonts - go build -o build/out/pixlet tidbyt.dev/pixlet +build: clean + go build -o pixlet tidbyt.dev/pixlet embedfonts: go run render/gen/embedfonts.go \ No newline at end of file