ui: Build ui within nix-shell.

This commit is contained in:
Orne Brocaar 2024-04-01 11:27:39 +01:00
parent d970b725ab
commit 984a86cc7a
3 changed files with 5 additions and 14 deletions

View File

@ -35,7 +35,7 @@ jobs:
run: docker compose up -d
-
name: Build UI
run: make build-ui
run: nix-shell --command "make build-ui"
-
name: Run tests
run: nix-shell --command "make test"
@ -66,7 +66,7 @@ jobs:
key: ${{ runner.os }}-cargo-dist-${{ hashFiles('**/Cargo.lock') }}
-
name: Build UI
run: make build-ui
run: nix-shell --command "make build-ui"
-
name: Install dev dependencies
run: nix-shell --command "make dev-dependencies"

View File

@ -41,7 +41,8 @@ api: version
# Builds the UI.
build-ui:
docker compose run --rm --no-deps chirpstack-ui make build
cd api && make grpc-web
cd ui && make build
# Enter the devshell.
devshell:

View File

@ -24,16 +24,6 @@ services:
ports:
- "8080:8080"
chirpstack-ui:
build:
context: ./ui
dockerfile: Dockerfile-devel
volumes:
- ./api/grpc-web:/chirpstack/api/grpc-web
- ./ui:/chirpstack/ui
ports:
- "3000:3000"
postgres:
image: postgres:11-alpine
volumes:
@ -75,4 +65,4 @@ services:
depends_on:
- zookeeper
ports:
- "9092:9092"
- "9092:9092"