diff options
| author |  vnugent <public@vaughnnugent.com> | 2024-01-09 11:13:24 -0500 |
|---|---|---|
| committer | vnugent <public@vaughnnugent.com> | 2024-01-09 11:13:24 -0500 |
| commit | af87d0785366cd849d8243aae28988fc444afa10 (patch) | |
| tree | b76cb8647e737378f2acceaedc65ed00665290e3 /ci | |
| parent | e01aae6c30f18003ceae07c092cddeb488e8f472 (diff) | |
fix some ci build issues & package updatesv0.1.4
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config/PageRouter.json | 2 | ||||
| -rw-r--r-- | ci/plugins.taskfile.yaml | 2 | ||||
| -rw-r--r-- | ci/taskfile.yaml | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/ci/config/PageRouter.json b/ci/config/PageRouter.json index 420757f..7d24da8 100644 --- a/ci/config/PageRouter.json +++ b/ci/config/PageRouter.json @@ -1,6 +1,6 @@ { "debug": false, "store": { - "route_file": "plugins/routes.xml" + "route_file": "config/routes.xml" } }
\ No newline at end of file diff --git a/ci/plugins.taskfile.yaml b/ci/plugins.taskfile.yaml index 4ff46d9..d64a224 100644 --- a/ci/plugins.taskfile.yaml +++ b/ci/plugins.taskfile.yaml @@ -29,7 +29,7 @@ tasks: #move dist files to web root - powershell -Command "cp -Recurse -Force ../front-end/dist {{.USER_WORKING_DIR}}" #move the plugin output - - powershell -Command "cp -Recurse -Force ../back-end/src/bin/release/net8.0/publish/* ./plugins/CMNext" + - powershell -Command "cp -Recurse -Force ../back-end/src/bin/release/net8.0/publish/* plugins/CMNext/" install-accounts: cmds: diff --git a/ci/taskfile.yaml b/ci/taskfile.yaml index db3da7b..8370793 100644 --- a/ci/taskfile.yaml +++ b/ci/taskfile.yaml @@ -7,7 +7,6 @@ version: "3" vars: BUILDS_URL: https://www.vaughnnugent.com/public/resources/software/builds - includes: plugins: @@ -81,7 +80,7 @@ tasks: #copy config - cmd: powershell -Command "cp -Recurse -Force config {{.BUILD_DIR}}" - + - task: get-webserver vars: TARGET_OS: '{{.TARGET_OS}}' @@ -90,20 +89,19 @@ tasks: get-webserver: internal: true cmds: - #install accounts plugin - task: install vars: PROJECT_NAME: 'VNLib.Webserver' MODULE_NAME: "VNLib.Webserver" FILE_NAME: "{{.TARGET_OS}}-release.tgz" - BUILD_DIR: '{{.BUILD_DIR}}' + BUILD_DIR: '{{.BUILD_DIR}}/webserver' - cmd: powershell -Command "cp -Force ./config/config.json {{.BUILD_DIR}}/config.json" install: internal: true vars: - DIR: '"{{.BUILD_DIR}}"/"{{.NAME}}"' + DIR: '"{{.BUILD_DIR}}"' cmds: #make the plugin directory - cmd: powershell -Command "mkdir {{.DIR}} -Force" |