@abgov/nx-oc 3.0.0 → 3.0.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abgov/nx-oc",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.1-beta.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"description": "Government of Alberta - DIO - Nx plugin for OpenShift.",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"executors": "./executors.json",
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"yaml": "^1.10.2",
|
|
16
|
-
"@nrwl/devkit": "13.
|
|
16
|
+
"@nrwl/devkit": "13.8.1"
|
|
17
17
|
},
|
|
18
18
|
"typings": "./src/index.d.ts",
|
|
19
19
|
"peerDependencies": {}
|
|
@@ -60,11 +60,11 @@ jobs:
|
|
|
60
60
|
|
|
61
61
|
# Project build steps lint, test, and build
|
|
62
62
|
- name: Lint
|
|
63
|
-
run:
|
|
63
|
+
run: npx nx affected --target=lint --base=${{ env.AFFECTED_BASE }}
|
|
64
64
|
- name: Test
|
|
65
|
-
run:
|
|
65
|
+
run: npx nx affected --target=test --base=${{ env.AFFECTED_BASE }}
|
|
66
66
|
- name: Build
|
|
67
|
-
run:
|
|
67
|
+
run: npx nx affected --target=build --base=${{ env.AFFECTED_BASE }} --configuration production
|
|
68
68
|
# Set affected apps to env for later steps and jobs.
|
|
69
69
|
- name: Set AFFECTED_APPS for OC steps
|
|
70
70
|
run: echo "AFFECTED_APPS=$(npx nx affected:apps --plain --base=${{ env.AFFECTED_BASE }})" >> $GITHUB_ENV
|
|
@@ -95,7 +95,7 @@ jobs:
|
|
|
95
95
|
|
|
96
96
|
deploy<%= envs[i] %>:
|
|
97
97
|
runs-on: ubuntu-20.04
|
|
98
|
-
needs: build
|
|
98
|
+
needs: [build<%= envs[i - 1] ? `, deploy${envs[i - 1]}` : '' %>]
|
|
99
99
|
env:
|
|
100
100
|
AFFECTED_APPS: ${{ needs.build.outputs.affected_apps }}
|
|
101
101
|
environment:
|
|
@@ -112,7 +112,7 @@ jobs:
|
|
|
112
112
|
run: |
|
|
113
113
|
for app in $AFFECTED_APPS
|
|
114
114
|
do
|
|
115
|
-
oc tag $app:latest $app:<%= envs[i].toLowerCase() %>
|
|
115
|
+
oc tag $app:<%= envs[i - 1] ? envs[i - 1].toLowerCase() : 'latest' %> $app:<%= envs[i].toLowerCase() %>
|
|
116
116
|
done
|
|
117
117
|
- name: Deploy <%= envs[i] %>
|
|
118
118
|
run: |
|
|
@@ -16,7 +16,7 @@ function normalizeOptions(host, options) {
|
|
|
16
16
|
}
|
|
17
17
|
function addFiles(host, options) {
|
|
18
18
|
var _a;
|
|
19
|
-
const envs = ['Dev', 'Test', '
|
|
19
|
+
const envs = ['Dev', 'Test', 'Prod'];
|
|
20
20
|
const templateOptions = Object.assign(Object.assign({}, options), { sourceRepositoryUrl: (_a = (0, git_utils_1.getGitRemoteUrl)()) === null || _a === void 0 ? void 0 : _a.trim(), envs, tmpl: '' });
|
|
21
21
|
if (options.pipelineType === 'jenkins') {
|
|
22
22
|
(0, devkit_1.generateFiles)(host, path.join(__dirname, 'jenkins'), `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift`, templateOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/pipeline/pipeline.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,6BAA6B;AAC7B,qDAAwD;AACxD,4DAA6D;AAG7D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAEnD,MAAM,aAAa,GAAG,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,KAAK,CAAC,GAAG,CAAC,KAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,eAAe,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,uCACK,OAAO,KACV,cAAc,EAAE,OAAO,CAAC,QAAQ,EAChC,cAAc,EAAE,OAAO,CAAC,KAAK,EAC7B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAC9B,YAAY,EAAE,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IACjE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;;IAErD,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../../../../packages/nx-oc/src/generators/pipeline/pipeline.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,6BAA6B;AAC7B,qDAAwD;AACxD,4DAA6D;AAG7D,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAEnD,MAAM,aAAa,GAAG,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,KAAK,CAAC,GAAG,CAAC,KAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,eAAe,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,uCACK,OAAO,KACV,cAAc,EAAE,OAAO,CAAC,QAAQ,EAChC,cAAc,EAAE,OAAO,CAAC,KAAK,EAC7B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAC9B,YAAY,EAAE,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IACjE;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;;IAErD,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC,MAAM,eAAe,mCAChB,OAAO,KACV,mBAAmB,EAAE,MAAA,IAAA,2BAAe,GAAE,0CAAE,IAAI,EAAE,EAC9C,IAAI,EACJ,IAAI,EAAE,EAAE,GACT,CAAC;IAEF,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;QACtC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,aAAa,EACpD,eAAe,CAChB,CAAC;KACH;SAAM,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,aAAa,EACpD,eAAe,CAChB,CAAC;QACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,EACzC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,oBAAoB,EAC3D,eAAe,CAChB,CAAC;KACH;AACH,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,iBAAiB,CAAC,aAAa,EAAE;YACnC,MAAM,IAAA,qBAAmB,EAAC,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;CAAA;AATD,4BASC"}
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"type": "string",
|
|
35
35
|
"description": "Names of the OpenShift Projects for environments.",
|
|
36
36
|
"alias": "e",
|
|
37
|
-
"x-prompt": "What projects should be used for environments (dev test
|
|
37
|
+
"x-prompt": "What projects should be used for environments (dev test prod)?"
|
|
38
38
|
},
|
|
39
39
|
"apply": {
|
|
40
40
|
"type": "boolean",
|