From 1eac11e4507571a3e7bdd058992c992c5577f9ba Mon Sep 17 00:00:00 2001 From: Thomas S Date: Fri, 27 Sep 2024 11:00:20 +0200 Subject: [PATCH] wip --- .github/workflows/backend.yml | 7 +++---- Makefile | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 45cebf8ba..eaa0880d4 100644 --- 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 index 8de6029cf..cb63349f9 100644 --- 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