diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 08a1ebbe6..f5efcf8d6 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -20,20 +20,6 @@ jobs: run: npm run lint working-directory: ./web - web_build: - name: Web - Build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - uses: actions/setup-node@master - with: - node-version: 16.x - - run: npm install - working-directory: ./web - - name: Build - run: npm run build - working-directory: ./web - web_test: name: Web - Test runs-on: ubuntu-latest @@ -71,6 +57,14 @@ jobs: steps: - name: Check out code uses: actions/checkout@v2 + - uses: actions/setup-node@master + with: + node-version: 16.x + - run: npm install + working-directory: ./web + - name: Build web + run: npm run build + working-directory: ./web - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx diff --git a/Makefile b/Makefile index cda1f2bdf..6702690b9 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ arm64: armv7: docker buildx build --platform linux/arm/v7 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) --file docker/Dockerfile . -build: version build_web amd64 arm64 armv7 +build: version amd64 arm64 armv7 docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) --file docker/Dockerfile . push: build