@docker/actions-toolkit 0.18.0 → 0.20.0-rc.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/lib/buildx/builder.js +28 -21
- package/lib/buildx/builder.js.map +1 -1
- package/lib/cache.d.ts +6 -0
- package/lib/cache.js +27 -3
- package/lib/cache.js.map +1 -1
- package/lib/index.js +6 -2
- package/lib/index.js.map +1 -1
- package/lib/types/builder.d.ts +1 -0
- package/package.json +3 -3
package/lib/buildx/builder.js
CHANGED
|
@@ -68,10 +68,16 @@ class Builder {
|
|
|
68
68
|
return ok;
|
|
69
69
|
}
|
|
70
70
|
async inspect(name) {
|
|
71
|
+
// always enable debug for inspect command, so we can display additional
|
|
72
|
+
// fields such as features: https://github.com/docker/buildx/pull/1854
|
|
73
|
+
const envs = Object.assign({}, process.env, {
|
|
74
|
+
DEBUG: '1'
|
|
75
|
+
});
|
|
71
76
|
const cmd = await this.buildx.getCommand(['inspect', name]);
|
|
72
77
|
return await exec_1.Exec.getExecOutput(cmd.command, cmd.args, {
|
|
73
78
|
ignoreReturnCode: true,
|
|
74
|
-
silent: true
|
|
79
|
+
silent: true,
|
|
80
|
+
env: envs
|
|
75
81
|
}).then(res => {
|
|
76
82
|
if (res.stderr.length > 0 && res.exitCode != 0) {
|
|
77
83
|
throw new Error(res.stderr.trim());
|
|
@@ -94,7 +100,7 @@ class Builder {
|
|
|
94
100
|
continue;
|
|
95
101
|
}
|
|
96
102
|
switch (true) {
|
|
97
|
-
case lkey == 'name':
|
|
103
|
+
case lkey == 'name':
|
|
98
104
|
parsingType = undefined;
|
|
99
105
|
if (builder.name == undefined) {
|
|
100
106
|
builder.name = value;
|
|
@@ -110,42 +116,36 @@ class Builder {
|
|
|
110
116
|
currentNode = { name: value };
|
|
111
117
|
}
|
|
112
118
|
break;
|
|
113
|
-
|
|
114
|
-
case lkey == 'driver': {
|
|
119
|
+
case lkey == 'driver':
|
|
115
120
|
parsingType = undefined;
|
|
116
121
|
builder.driver = value;
|
|
117
122
|
break;
|
|
118
|
-
|
|
119
|
-
case lkey == 'last activity': {
|
|
123
|
+
case lkey == 'last activity':
|
|
120
124
|
parsingType = undefined;
|
|
121
125
|
builder.lastActivity = new Date(value);
|
|
122
126
|
break;
|
|
123
|
-
|
|
124
|
-
case lkey == 'endpoint': {
|
|
127
|
+
case lkey == 'endpoint':
|
|
125
128
|
parsingType = undefined;
|
|
126
129
|
currentNode.endpoint = value;
|
|
127
130
|
break;
|
|
128
|
-
|
|
129
|
-
case lkey == 'driver options': {
|
|
131
|
+
case lkey == 'driver options':
|
|
130
132
|
parsingType = undefined;
|
|
131
133
|
currentNode['driver-opts'] = (value.match(/([a-zA-Z0-9_.]+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2'));
|
|
132
134
|
break;
|
|
133
|
-
|
|
134
|
-
case lkey == 'status': {
|
|
135
|
+
case lkey == 'status':
|
|
135
136
|
parsingType = undefined;
|
|
136
137
|
currentNode.status = value;
|
|
137
138
|
break;
|
|
138
|
-
|
|
139
|
-
case lkey == 'flags':
|
|
139
|
+
case lkey == 'buildkit daemon flags':
|
|
140
|
+
case lkey == 'flags': // buildx < v0.13
|
|
140
141
|
parsingType = undefined;
|
|
141
142
|
currentNode['buildkitd-flags'] = value;
|
|
142
143
|
break;
|
|
143
|
-
|
|
144
|
-
case lkey == 'buildkit':
|
|
144
|
+
case lkey == 'buildkit version':
|
|
145
|
+
case lkey == 'buildkit': // buildx < v0.13
|
|
145
146
|
parsingType = undefined;
|
|
146
147
|
currentNode.buildkit = value;
|
|
147
148
|
break;
|
|
148
|
-
}
|
|
149
149
|
case lkey == 'platforms': {
|
|
150
150
|
parsingType = undefined;
|
|
151
151
|
if (!value) {
|
|
@@ -168,21 +168,28 @@ class Builder {
|
|
|
168
168
|
currentNode.platforms = platforms.join(',');
|
|
169
169
|
break;
|
|
170
170
|
}
|
|
171
|
-
case lkey == '
|
|
171
|
+
case lkey == 'features':
|
|
172
|
+
parsingType = 'features';
|
|
173
|
+
currentNode.features = {};
|
|
174
|
+
break;
|
|
175
|
+
case lkey == 'labels':
|
|
172
176
|
parsingType = 'label';
|
|
173
177
|
currentNode.labels = {};
|
|
174
178
|
break;
|
|
175
|
-
|
|
176
|
-
case lkey.startsWith('gc policy rule#'): {
|
|
179
|
+
case lkey.startsWith('gc policy rule#'):
|
|
177
180
|
parsingType = 'gcpolicy';
|
|
178
181
|
if (currentNode.gcPolicy && currentGCPolicy) {
|
|
179
182
|
currentNode.gcPolicy.push(currentGCPolicy);
|
|
180
183
|
currentGCPolicy = undefined;
|
|
181
184
|
}
|
|
182
185
|
break;
|
|
183
|
-
}
|
|
184
186
|
default: {
|
|
185
187
|
switch (parsingType || '') {
|
|
188
|
+
case 'features': {
|
|
189
|
+
currentNode.features = currentNode.features || {};
|
|
190
|
+
currentNode.features[key.trim()] = Boolean(value);
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
186
193
|
case 'label': {
|
|
187
194
|
currentNode.labels = currentNode.labels || {};
|
|
188
195
|
currentNode.labels[key.trim()] = value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/buildx/builder.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAAsC;AAEtC,qCAAgC;AAChC,kCAA6B;AAQ7B,MAAa,OAAO;IACD,MAAM,CAAS;IAEhC,YAAY,IAAkB;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,IAAI,eAAM,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,IAAY;QAC9B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;QAE5D,MAAM,EAAE,GAAY,MAAM,WAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE;YAClE,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,IAAI;SACb,CAAC;aACC,IAAI,CAAC,GAAG,CAAC,EAAE;YACV,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,IAAI,CAAC,EAAE;gBAC9C,IAAI,CAAC,KAAK,CAAC,2BAA2B,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC3D,OAAO,KAAK,CAAC;aACd;YACD,OAAO,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC;aACD,KAAK,CAAC,KAAK,CAAC,EAAE;YACb,IAAI,CAAC,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;YAC7C,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QACpC,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAY;QAC/B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5D,OAAO,MAAM,WAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE;YACrD,gBAAgB,EAAE,IAAI;YACtB,MAAM,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/buildx/builder.ts"],"names":[],"mappings":"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"}
|
package/lib/cache.d.ts
CHANGED
|
@@ -20,15 +20,21 @@ export interface CacheOpts {
|
|
|
20
20
|
cacheFile: string;
|
|
21
21
|
ghaNoCache?: boolean;
|
|
22
22
|
}
|
|
23
|
+
export interface CachePostState {
|
|
24
|
+
dir: string;
|
|
25
|
+
key: string;
|
|
26
|
+
}
|
|
23
27
|
export declare class Cache {
|
|
24
28
|
private readonly opts;
|
|
25
29
|
private readonly ghaCacheKey;
|
|
26
30
|
private readonly ghaNoCache?;
|
|
27
31
|
private readonly cacheDir;
|
|
28
32
|
private readonly cachePath;
|
|
33
|
+
private static readonly POST_CACHE_KEY;
|
|
29
34
|
constructor(opts: CacheOpts);
|
|
30
35
|
save(file: string): Promise<string>;
|
|
31
36
|
find(): Promise<string>;
|
|
37
|
+
static post(): Promise<CachePostState | undefined>;
|
|
32
38
|
private copyToCache;
|
|
33
39
|
private platform;
|
|
34
40
|
}
|
package/lib/cache.js
CHANGED
|
@@ -55,6 +55,7 @@ class Cache {
|
|
|
55
55
|
ghaNoCache;
|
|
56
56
|
cacheDir;
|
|
57
57
|
cachePath;
|
|
58
|
+
static POST_CACHE_KEY = 'postCache';
|
|
58
59
|
constructor(opts) {
|
|
59
60
|
this.opts = opts;
|
|
60
61
|
this.ghaCacheKey = util.format('%s-%s-%s', this.opts.htcName, this.opts.htcVersion, this.platform());
|
|
@@ -71,8 +72,11 @@ class Cache {
|
|
|
71
72
|
const htcPath = await tc.cacheDir(this.cacheDir, this.opts.htcName, this.opts.htcVersion, this.platform());
|
|
72
73
|
core.debug(`Cache.save cached to hosted tool cache ${htcPath}`);
|
|
73
74
|
if (!this.ghaNoCache && cache.isFeatureAvailable()) {
|
|
74
|
-
core.debug(`Cache.save
|
|
75
|
-
|
|
75
|
+
core.debug(`Cache.save sending ${this.ghaCacheKey} to post state`);
|
|
76
|
+
core.saveState(Cache.POST_CACHE_KEY, JSON.stringify({
|
|
77
|
+
dir: this.cacheDir,
|
|
78
|
+
key: this.ghaCacheKey
|
|
79
|
+
}));
|
|
76
80
|
}
|
|
77
81
|
return cachePath;
|
|
78
82
|
}
|
|
@@ -87,7 +91,7 @@ class Cache {
|
|
|
87
91
|
if (await cache.restoreCache([this.cacheDir], this.ghaCacheKey)) {
|
|
88
92
|
core.info(`Restored ${this.ghaCacheKey} from GitHub Actions cache`);
|
|
89
93
|
htcPath = await tc.cacheDir(this.cacheDir, this.opts.htcName, this.opts.htcVersion, this.platform());
|
|
90
|
-
core.info(`
|
|
94
|
+
core.info(`Cached to hosted tool cache ${htcPath}`);
|
|
91
95
|
return this.copyToCache(`${htcPath}/${this.opts.cacheFile}`);
|
|
92
96
|
}
|
|
93
97
|
}
|
|
@@ -99,6 +103,26 @@ class Cache {
|
|
|
99
103
|
}
|
|
100
104
|
return '';
|
|
101
105
|
}
|
|
106
|
+
static async post() {
|
|
107
|
+
const state = core.getState(Cache.POST_CACHE_KEY);
|
|
108
|
+
if (!state) {
|
|
109
|
+
core.debug(`Cache.post no state`);
|
|
110
|
+
return Promise.resolve(undefined);
|
|
111
|
+
}
|
|
112
|
+
let cacheState;
|
|
113
|
+
try {
|
|
114
|
+
cacheState = JSON.parse(state);
|
|
115
|
+
}
|
|
116
|
+
catch (e) {
|
|
117
|
+
throw new Error(`Failed to parse cache post state: ${e}`);
|
|
118
|
+
}
|
|
119
|
+
if (!cacheState.dir || !cacheState.key) {
|
|
120
|
+
throw new Error(`Invalid cache post state: ${state}`);
|
|
121
|
+
}
|
|
122
|
+
core.info(`Caching ${cacheState.key} to GitHub Actions cache`);
|
|
123
|
+
await cache.saveCache([cacheState.dir], cacheState.key);
|
|
124
|
+
return cacheState;
|
|
125
|
+
}
|
|
102
126
|
copyToCache(file) {
|
|
103
127
|
core.debug(`Copying ${file} to ${this.cachePath}`);
|
|
104
128
|
fs_1.default.copyFileSync(file, this.cachePath);
|
package/lib/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AACxB,oDAAsC;AACtC,wDAA0C;AAC1C,sDAAwC;AACxC,2CAA6B;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -40,6 +40,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
40
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
41
41
|
exports.run = void 0;
|
|
42
42
|
const core = __importStar(require("@actions/core"));
|
|
43
|
+
const cache_1 = require("./cache");
|
|
43
44
|
const isPost = !!process.env['STATE_isPost'];
|
|
44
45
|
if (!isPost) {
|
|
45
46
|
core.saveState('isPost', 'true');
|
|
@@ -61,8 +62,11 @@ async function run(main, post) {
|
|
|
61
62
|
core.setFailed(e.message);
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
|
-
else
|
|
65
|
-
|
|
65
|
+
else {
|
|
66
|
+
if (post) {
|
|
67
|
+
await post();
|
|
68
|
+
}
|
|
69
|
+
await cache_1.Cache.post();
|
|
66
70
|
}
|
|
67
71
|
}
|
|
68
72
|
exports.run = run;
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAAsC;AAEtC,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAC7C,IAAI,CAAC,MAAM,EAAE;IACX,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,GAAG,CAAC,IAAyB,EAAE,IAA0B;IAC7E,IAAI,CAAC,MAAM,EAAE;QACX,IAAI;YACF,MAAM,IAAI,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SAC3B;KACF;SAAM,IAAI,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAAsC;AAEtC,mCAA8B;AAE9B,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAC7C,IAAI,CAAC,MAAM,EAAE;IACX,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,GAAG,CAAC,IAAyB,EAAE,IAA0B;IAC7E,IAAI,CAAC,MAAM,EAAE;QACX,IAAI;YACF,MAAM,IAAI,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SAC3B;KACF;SAAM;QACL,IAAI,IAAI,EAAE;YACR,MAAM,IAAI,EAAE,CAAC;SACd;QACD,MAAM,aAAK,CAAC,IAAI,EAAE,CAAC;KACpB;AACH,CAAC;AAbD,kBAaC"}
|
package/lib/types/builder.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@docker/actions-toolkit",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.20.0-rc.1",
|
|
4
4
|
"description": "Toolkit for Docker (GitHub) Actions",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@actions/core": "^1.10.1",
|
|
50
50
|
"@actions/exec": "^1.1.1",
|
|
51
51
|
"@actions/github": "^6.0.0",
|
|
52
|
-
"@actions/http-client": "^2.2.
|
|
52
|
+
"@actions/http-client": "^2.2.1",
|
|
53
53
|
"@actions/io": "^1.1.3",
|
|
54
54
|
"@actions/tool-cache": "^2.0.1",
|
|
55
55
|
"@octokit/core": "^5.1.0",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"handlebars": "^4.7.8",
|
|
60
60
|
"jwt-decode": "^4.0.0",
|
|
61
61
|
"semver": "^7.5.4",
|
|
62
|
-
"tmp": "^0.2.
|
|
62
|
+
"tmp": "^0.2.3"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"@types/csv-parse": "^1.2.2",
|