From dc8b67329918329c02c538b785ff963a5e332f17 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Tue, 12 Apr 2022 20:22:51 +0200 Subject: [PATCH] Build the UI when making UI tarball (#10578) We run ui-install on ci but not ui-build. This PR resolves that. Signed-off-by: Julien Pivotto --- .circleci/config.yml | 4 +--- Makefile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 966c546f2..5bbeecedf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,11 +58,9 @@ jobs: keys: - v3-npm-deps-{{ checksum "web/ui/package-lock.json" }} - v3-npm-deps- - - run: make ui-install + - run: make assets-tarball - run: make ui-lint - - run: make ui-build-module - run: make ui-test - - run: make assets-tarball -o assets - persist_to_workspace: root: . paths: diff --git a/Makefile b/Makefile index c5b58bf5a..59c16e1d6 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ assets-compress: assets scripts/compress_assets.sh .PHONY: assets-tarball -assets-tarball: assets-compress +assets-tarball: assets @echo '>> packaging assets' scripts/package_assets.sh