wip

probabl-ai · Sep 27, 2024 · 1eac11e · 1eac11e
1 parent 81f6191
commit 1eac11e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -29,11 +29,11 @@ jobs:
 
           npm install
           npm run build
-          npm run build:lib
+          npm run build:lib -- --emptyOutDir false
       - uses: actions/upload-artifact@v4
         with:
           name: frontend-package-distributions
-          path: frontend/dist/*
+          path: frontend/dist
 
   test-backend:
     runs-on: ubuntu-latest
@@ -61,8 +61,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: frontend-package-distributions
-          path: src/skore/ui/static  # ?
-          merge-multiple: true  # ?
+          path: src/skore/ui/static
 
       - name: Build
         run: |

diff --git a/Makefile b/Makefile
@@ -34,14 +34,15 @@ serve-ui:
 		--timeout-graceful-shutdown 0
 
 build-frontend:
-	# build the SPA
-	cd frontend && npm install
-	cd frontend && npm run build
-	# empty app static folder
-	rm -rf src/skore/ui/static
-	cp -a frontend/dist/. src/skore/ui/static
-	# build the sharing library
-	cd frontend && npm run build:lib
-	cp -a frontend/dist/. src/skore/ui/static
-	# clean up
+	# cleanup
 	rm -rf frontend/dist
+	rm -rf src/skore/ui/static
+	# build
+	(\
+		cd frontend;\
+		npm install;\
+		npm run build;\
+		npm run build:lib -- --emptyOutDir false;\
+	)
+	# move
+	mv frontend/dist/ src/skore/ui/static