diff options
| -rw-r--r-- | Module.Taskfile.yaml | 2 | ||||
| -rw-r--r-- | ci/plugins.taskfile.yaml | 2 | ||||
| -rw-r--r-- | front-end/Taskfile.yaml | 13 | ||||
| -rw-r--r-- | lib/admin/package-lock.json | 7 |
4 files changed, 14 insertions, 10 deletions
diff --git a/Module.Taskfile.yaml b/Module.Taskfile.yaml index 3f2455d..0c1783f 100644 --- a/Module.Taskfile.yaml +++ b/Module.Taskfile.yaml @@ -9,8 +9,8 @@ tasks: #update project source code update: cmds: - - git remote update - git reset --hard + - git remote update - git pull origin {{.BRANCH_NAME}} --verify-signatures #re-write semver for back-end after hard reset - dotnet-gitversion.exe /updateprojectfiles diff --git a/ci/plugins.taskfile.yaml b/ci/plugins.taskfile.yaml index 43fc8db..dda3838 100644 --- a/ci/plugins.taskfile.yaml +++ b/ci/plugins.taskfile.yaml @@ -40,7 +40,7 @@ tasks: build-proj: cmds: #build front-end - - cd ../front-end && npm install && npm run build + - cd ../front-end && task ci-build #move dist files to web root - cmd: powershell -Command "cp -Recurse -Force ../front-end/dist {{.USER_WORKING_DIR}}" diff --git a/front-end/Taskfile.yaml b/front-end/Taskfile.yaml index c64dc22..d7d777b 100644 --- a/front-end/Taskfile.yaml +++ b/front-end/Taskfile.yaml @@ -9,12 +9,15 @@ tasks: cmds: - cmd: npm version {{ .BUILD_VERSION }} ignore_error: true #error if run when version is not updated - + - task: ci-build + + ci-build: + cmds: #build admin first - - cd ../lib/admin && npm install && npm run build - #install deps and run main build - - npm install - - npm run build + - cd ../lib/admin && npm install && npm run build + #install deps and run main build + - npm install + - npm run build #copy artifacts to temp directory postbuild_success: diff --git a/lib/admin/package-lock.json b/lib/admin/package-lock.json index 59dd02a..397a3fc 100644 --- a/lib/admin/package-lock.json +++ b/lib/admin/package-lock.json @@ -14,7 +14,7 @@ "@typescript-eslint/eslint-plugin": "^7.0.x" }, "peerDependencies": { - "@vnuge/vnlib.browser": "https://www.vaughnnugent.com/public/resources/software/builds/Plugins.Essentials/f2ac807486a00db4ba8486133d567e392f0fe98a/@vnuge-vnlib.browser/release.tgz", + "@vnuge/vnlib.browser": "https://www.vaughnnugent.com/public/resources/software/builds/Plugins.Essentials/451091e93b5feee7a5e01d3a81f5d63efa7ea8be/@vnuge-vnlib.browser/release.tgz", "@vueuse/core": "^10.x", "axios": "^1.x", "jose": "^5.1.x", @@ -457,8 +457,9 @@ }, "node_modules/@vnuge/vnlib.browser": { "version": "0.1.13", - "resolved": "https://www.vaughnnugent.com/public/resources/software/builds/Plugins.Essentials/f2ac807486a00db4ba8486133d567e392f0fe98a/@vnuge-vnlib.browser/release.tgz", - "integrity": "sha512-j3BwCdXWJ46Q7GohS+rZg7M5k1/AS+uuycP7wY8RWI2YBKS80uTE6jbWZ0OuCybclBrCufvW7SlTTpfsbf33mw==", + "resolved": "https://www.vaughnnugent.com/public/resources/software/builds/Plugins.Essentials/451091e93b5feee7a5e01d3a81f5d63efa7ea8be/@vnuge-vnlib.browser/release.tgz", + "integrity": "sha512-xCb6YYJDGtkdEjhjKfSbb8lN1YZ3qL2RqlMWD0IvYnAxXkbY0/qYW7LxEaM3dQzdb/Tw7t/BdRj7Dz7E66SufA==", + "license": "MIT", "peer": true, "peerDependencies": { "@vueuse/core": "^10.x", |