diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe21984..030ac9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ check: build: - image: node:14-buster + image: registry.hottis.de/hv2/hv2-node-build-env:1.0.0 stage: build variables: GIT_SUBMODULE_STRATEGY: recursive @@ -42,7 +42,7 @@ build: sed -i -e 's/GITTAGVERSION/'"$CI_COMMIT_TAG"':'"$CI_COMMIT_SHORT_SHA"'/' ./src/app/navigation/navigation.component.html; fi - npm install - - npm run generate3 + - npm run generate - ./node_modules/.bin/ng build --prod - tar -czf ../dist.tgz dist diff --git a/hv2-ui/package.json b/hv2-ui/package.json index dd2ecc4..87b68fa 100644 --- a/hv2-ui/package.json +++ b/hv2-ui/package.json @@ -8,8 +8,7 @@ "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", - "generate": "python ../helpers/hv2-api/generate.py -s ../helpers/hv2-api/schema.json -t ./src/app/*.tmpl", - "generate3": "python3 ../helpers/hv2-api/generate.py -s ../helpers/hv2-api/schema.json -t ./src/app/*.tmpl" + "generate": "python ../helpers/hv2-api/generate.py -s ../helpers/hv2-api/schema.json -t ./src/app/*.tmpl" }, "private": true,