@sebbo2002/semantic-release-docker 1.0.1-develop.1 → 1.0.1-develop.2
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/dist/index.js +9 -8
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/package.json +19 -20
package/dist/index.js
CHANGED
|
@@ -114,9 +114,6 @@ function getTagTasks(config, context) {
|
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
116
|
// channel
|
|
117
|
-
// Sadly, channel is not defined in the types…
|
|
118
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
119
|
-
// @ts-ignore
|
|
120
117
|
const channel = (_a = context.nextRelease) === null || _a === void 0 ? void 0 : _a.channel;
|
|
121
118
|
if (config.tag.channel && channel) {
|
|
122
119
|
result.push({
|
|
@@ -131,10 +128,17 @@ exports.getTagTasks = getTagTasks;
|
|
|
131
128
|
function docker(command) {
|
|
132
129
|
return __awaiter(this, void 0, void 0, function* () {
|
|
133
130
|
try {
|
|
134
|
-
yield execa_1.default('docker', command);
|
|
131
|
+
yield (0, execa_1.default)('docker', command);
|
|
135
132
|
}
|
|
136
133
|
catch (error) {
|
|
137
|
-
|
|
134
|
+
if (typeof error === 'object' && error !== null && 'command' in error && 'message' in error) {
|
|
135
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
136
|
+
// @ts-ignore
|
|
137
|
+
throw new Error(`Unable to run "${error.command}": ${error.message}`);
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
throw new Error(`Unable to run "${command.join(' ')}": ${error}`);
|
|
141
|
+
}
|
|
138
142
|
}
|
|
139
143
|
});
|
|
140
144
|
}
|
|
@@ -169,9 +173,6 @@ function publish(pluginConfig, context) {
|
|
|
169
173
|
context.logger.log(`Push ${task.output}`);
|
|
170
174
|
yield pushImage(task.output);
|
|
171
175
|
}
|
|
172
|
-
// Sadly, channel is not defined in the types…
|
|
173
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
174
|
-
// @ts-ignore
|
|
175
176
|
const channel = (_a = context.nextRelease) === null || _a === void 0 ? void 0 : _a.channel;
|
|
176
177
|
const firstTask = tasks[0];
|
|
177
178
|
return {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/lib/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/lib/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"author": "Sebastian Pekarek <
|
|
2
|
+
"author": "Sebastian Pekarek <mail@sebbo.net>",
|
|
3
3
|
"bugs": {
|
|
4
4
|
"url": "https://github.com/sebbo2002/semantic-release-docker/issues"
|
|
5
5
|
},
|
|
@@ -8,27 +8,26 @@
|
|
|
8
8
|
},
|
|
9
9
|
"description": "Plugin for semantic-release that tags a previously built Docker image and pushes it to one or more Docker registries",
|
|
10
10
|
"devDependencies": {
|
|
11
|
-
"@amanda-mitchell/semantic-release-npm-multiple": "^2.
|
|
12
|
-
"@qiwi/semantic-release-gh-pages-plugin": "^5.0
|
|
13
|
-
"@semantic-release/changelog": "^
|
|
14
|
-
"@semantic-release/exec": "^
|
|
15
|
-
"@semantic-release/git": "^
|
|
16
|
-
"@types/
|
|
17
|
-
"@types/
|
|
18
|
-
"@types/
|
|
19
|
-
"@
|
|
20
|
-
"@typescript-eslint/
|
|
21
|
-
"
|
|
22
|
-
"eslint": "^
|
|
23
|
-
"eslint-plugin-jsonc": "^1.3.1",
|
|
11
|
+
"@amanda-mitchell/semantic-release-npm-multiple": "^2.15.0",
|
|
12
|
+
"@qiwi/semantic-release-gh-pages-plugin": "^5.2.0",
|
|
13
|
+
"@semantic-release/changelog": "^6.0.1",
|
|
14
|
+
"@semantic-release/exec": "^6.0.2",
|
|
15
|
+
"@semantic-release/git": "^10.0.1",
|
|
16
|
+
"@types/mocha": "^9.0.0",
|
|
17
|
+
"@types/node": "^16.11.10",
|
|
18
|
+
"@types/semantic-release": "^17.2.3",
|
|
19
|
+
"@typescript-eslint/eslint-plugin": "^5.4.0",
|
|
20
|
+
"@typescript-eslint/parser": "^5.4.0",
|
|
21
|
+
"eslint": "^8.3.0",
|
|
22
|
+
"eslint-plugin-jsonc": "^2.0.0",
|
|
24
23
|
"license-checker": "^25.0.1",
|
|
25
|
-
"mocha": "^9.
|
|
26
|
-
"mochawesome": "^
|
|
24
|
+
"mocha": "^9.1.3",
|
|
25
|
+
"mochawesome": "^7.0.1",
|
|
27
26
|
"nyc": "^15.1.0",
|
|
28
27
|
"semantic-release-license": "^1.0.3",
|
|
29
|
-
"ts-node": "^10.
|
|
30
|
-
"typedoc": "^0.
|
|
31
|
-
"typescript": "^4.
|
|
28
|
+
"ts-node": "^10.4.0",
|
|
29
|
+
"typedoc": "^0.22.10",
|
|
30
|
+
"typescript": "^4.5.2"
|
|
32
31
|
},
|
|
33
32
|
"engines": {
|
|
34
33
|
"node": ">=12.0.0"
|
|
@@ -52,5 +51,5 @@
|
|
|
52
51
|
"lint": "eslint . --ext .ts,.json",
|
|
53
52
|
"test": "mocha"
|
|
54
53
|
},
|
|
55
|
-
"version": "1.0.1-develop.
|
|
54
|
+
"version": "1.0.1-develop.2"
|
|
56
55
|
}
|