rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update build output location

Browse source 
This now places the static web app in the correct location for the v3 back-end code.
This commit is contained in:
Richard Bowman 2024-01-03 20:50:33 +00:00
parent 656e902198
commit 35db80121a
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -113,7 +113,7 @@ build:
name: "dist" name: "dist"
expire_in: 1 week expire_in: 1 week
paths: paths:
- "openflexure_microscope/api/static/dist/" - "src/openflexure_microscope/static/"
# Package application into distribution tarball # Package application into distribution tarball
package: package:
@ -128,7 +128,7 @@ package:
# Build distribution archive # Build distribution archive
- mkdir -p dist - mkdir -p dist
- tar -c --exclude-vcs --exclude-from .tarignore -vzf dist/openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz . - tar -c --exclude-vcs --exclude-from .tarignore -vzf dist/openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz .
- tar -c --exclude-vcs --exclude-from .tarignore -vzf dist/openflexure-microscope-webapp-${CI_COMMIT_REF_NAME}.tar.gz ./openflexure_microscope/api/static/dist/ - tar -c --exclude-vcs --exclude-from .tarignore -vzf dist/openflexure-microscope-webapp-${CI_COMMIT_REF_NAME}.tar.gz ./openflexure_microscope_server/static/
- cp docs/build/swagger.yaml dist/openflexure-microscope-api-${CI_COMMIT_REF_NAME}.yaml - cp docs/build/swagger.yaml dist/openflexure-microscope-api-${CI_COMMIT_REF_NAME}.yaml
- cd dist/ - cd dist/
- sha256sum openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz > openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz.sha256 - sha256sum openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz > openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz.sha256

2
webapp/.env.development
View file

@ -2,4 +2,4 @@ NODE_ENV=development
VUE_APP_MODE=development VUE_APP_MODE=development
VUE_APP_PLATFORM=web VUE_APP_PLATFORM=web
VUE_APP_TARGET=web VUE_APP_TARGET=web
VUE_APP_ENABLE_IMJOY=true VUE_APP_ENABLE_IMJOY=true

2
webapp/vue.config.js
View file

@ -1,3 +1,3 @@
module.exports = { module.exports = {
outputDir: "../openflexure_microscope/api/static/dist" outputDir: "../src/openflexure_microscope_server/static"
}; };