diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4a720c5..61355464 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: .python-install-template: &python-install before_script: - python3 -m venv .venv # NB this does not overwrite an existing cached venv - - source .venv/bin/activate + - source .venv/bin/activate - pip install pipenv # Should be cached after first run - pipenv install --dev --deploy # Should be cached after first run - will just check packages are present cache: @@ -21,12 +21,12 @@ stages: # Re-usable block to install (and cache) openflexure-microscope-server static app .node-install-template: &node-install before_script: - - cd openflexure_microscope/api/static/ + - cd js/ - npm install cache: key: "${CI_COMMIT_REF_SLUG}" paths: - - openflexure_microscope/api/static/node_modules + - js/node_modules # Python static analysis with PyLint pylint: @@ -162,7 +162,7 @@ build: name: "dist" expire_in: 1 week paths: - - "./openflexure_microscope/api/static/dist/" + - "js/" only: - master