@ship-et/buildatlas-cli 0.11.0 → 0.13.0
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/client.d.ts.map +1 -1
- package/dist/client.js +56 -0
- package/dist/client.js.map +1 -1
- package/dist/client.test.js +56 -0
- package/dist/client.test.js.map +1 -1
- package/dist/commands/build.d.ts.map +1 -1
- package/dist/commands/build.js +80 -15
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/credentials-wizard.d.ts +1 -1
- package/dist/commands/credentials-wizard.d.ts.map +1 -1
- package/dist/commands/credentials-wizard.js +20 -0
- package/dist/commands/credentials-wizard.js.map +1 -1
- package/dist/commands/credentials.d.ts.map +1 -1
- package/dist/commands/credentials.js +11 -3
- package/dist/commands/credentials.js.map +1 -1
- package/dist/commands/migrate/auth.d.ts +9 -0
- package/dist/commands/migrate/auth.d.ts.map +1 -0
- package/dist/commands/migrate/auth.js +8 -0
- package/dist/commands/migrate/auth.js.map +1 -0
- package/dist/commands/migrate/build-numbers.d.ts +12 -0
- package/dist/commands/migrate/build-numbers.d.ts.map +1 -0
- package/dist/commands/migrate/build-numbers.js +34 -0
- package/dist/commands/migrate/build-numbers.js.map +1 -0
- package/dist/commands/migrate/credentials.d.ts +24 -0
- package/dist/commands/migrate/credentials.d.ts.map +1 -0
- package/dist/commands/migrate/credentials.js +78 -0
- package/dist/commands/migrate/credentials.js.map +1 -0
- package/dist/commands/migrate/eas-client.d.ts +88 -0
- package/dist/commands/migrate/eas-client.d.ts.map +1 -0
- package/dist/commands/migrate/eas-client.js +186 -0
- package/dist/commands/migrate/eas-client.js.map +1 -0
- package/dist/commands/migrate/expo-session.d.ts +10 -0
- package/dist/commands/migrate/expo-session.d.ts.map +1 -0
- package/dist/commands/migrate/expo-session.js +51 -0
- package/dist/commands/migrate/expo-session.js.map +1 -0
- package/dist/commands/migrate/index.d.ts +3 -0
- package/dist/commands/migrate/index.d.ts.map +1 -0
- package/dist/commands/migrate/index.js +117 -0
- package/dist/commands/migrate/index.js.map +1 -0
- package/dist/commands/migrate/link-project.d.ts +13 -0
- package/dist/commands/migrate/link-project.d.ts.map +1 -0
- package/dist/commands/migrate/link-project.js +74 -0
- package/dist/commands/migrate/link-project.js.map +1 -0
- package/dist/commands/migrate/retry.d.ts +8 -0
- package/dist/commands/migrate/retry.d.ts.map +1 -0
- package/dist/commands/migrate/retry.js +25 -0
- package/dist/commands/migrate/retry.js.map +1 -0
- package/dist/config.d.ts +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/spinner.d.ts +8 -0
- package/dist/spinner.d.ts.map +1 -0
- package/dist/spinner.js +35 -0
- package/dist/spinner.js.map +1 -0
- package/package.json +2 -3
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA6B/C,qBAAa,aAAc,SAAQ,KAAK;IAGtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,YAAY,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAIxD;CACF;AAID;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAsCpC;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAChC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,EACnC,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAO,GACxE,OAAO,CAAC,CAAC,CAAC,CAyEZ"}
|
package/dist/client.js
CHANGED
|
@@ -1,3 +1,27 @@
|
|
|
1
|
+
import { createRequire } from 'node:module';
|
|
2
|
+
/**
|
|
3
|
+
* Duplicated from @buildatlas/shared/cli-version rather than imported.
|
|
4
|
+
*
|
|
5
|
+
* This package is published on its own and `@buildatlas/shared` is a private workspace
|
|
6
|
+
* package, so importing it resolves here and fails for every installed user with
|
|
7
|
+
* ERR_MODULE_NOT_FOUND. There is a test that enforces this, and it caught exactly that
|
|
8
|
+
* mistake being made here. Two constants and four lines of comparison are a cheaper
|
|
9
|
+
* duplication than a broken install.
|
|
10
|
+
*/
|
|
11
|
+
const CLI_VERSION_HEADER = 'x-buildatlas-cli-latest';
|
|
12
|
+
/** Numeric per segment: "0.9.0" must sort below "0.10.0", and string comparison does not. */
|
|
13
|
+
function isCliOutdated(mine, latest) {
|
|
14
|
+
const parts = (v) => (v.match(/\d+/g) ?? []).map(Number);
|
|
15
|
+
const [a, b] = [parts(mine), parts(latest)];
|
|
16
|
+
for (let i = 0; i < Math.max(a.length, b.length); i += 1) {
|
|
17
|
+
const diff = (a[i] ?? 0) - (b[i] ?? 0);
|
|
18
|
+
if (diff !== 0)
|
|
19
|
+
return diff < 0;
|
|
20
|
+
}
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
/** This build's own version, read rather than repeated — a --version that lies is worse. */
|
|
24
|
+
const { version: THIS_CLI_VERSION } = createRequire(import.meta.url)('../package.json');
|
|
1
25
|
export class AtlasApiError extends Error {
|
|
2
26
|
// Explicit fields: Node's type-stripping mode does not support parameter
|
|
3
27
|
// properties, and the built CLI runs under plain Node.
|
|
@@ -18,6 +42,30 @@ function retryable(status) {
|
|
|
18
42
|
// nothing but the wait.
|
|
19
43
|
return status === 502 || status === 503 || status === 504;
|
|
20
44
|
}
|
|
45
|
+
/**
|
|
46
|
+
* Says once, per run, when this CLI is behind the server.
|
|
47
|
+
*
|
|
48
|
+
* Once per process, not per request: a line on every HTTP call trains people to ignore
|
|
49
|
+
* it. On stderr, so it never lands in the middle of output somebody is piping.
|
|
50
|
+
*
|
|
51
|
+
* It exists because of a real hour-long build. The packing fix that took a Flutter upload
|
|
52
|
+
* from 1.2 GB to 2 MB shipped in the CLI; the developer's CLI was behind; their builds
|
|
53
|
+
* simply stayed slow and nothing anywhere connected the two. A build tool cannot upgrade
|
|
54
|
+
* a machine it does not run on, but it can refuse to be quiet about it.
|
|
55
|
+
*/
|
|
56
|
+
let skewReported = false;
|
|
57
|
+
function reportVersionSkew(res, apiUrl) {
|
|
58
|
+
if (skewReported)
|
|
59
|
+
return;
|
|
60
|
+
const latest = res.headers.get(CLI_VERSION_HEADER);
|
|
61
|
+
if (!latest || !isCliOutdated(THIS_CLI_VERSION, latest))
|
|
62
|
+
return;
|
|
63
|
+
skewReported = true;
|
|
64
|
+
process.stderr.write(`! This CLI is ${THIS_CLI_VERSION}; this server expects ${latest}.\n` +
|
|
65
|
+
' An older CLI can upload far more source than it needs to, which shows up as a\n' +
|
|
66
|
+
' slow build rather than as an error. Install the current one:\n' +
|
|
67
|
+
` npm install -g ${new URL('/cli/buildatlas.tgz', apiUrl).toString()}\n`);
|
|
68
|
+
}
|
|
21
69
|
/**
|
|
22
70
|
* Minimal API client over the platform fetch. Takes an explicit token rather
|
|
23
71
|
* than reading config itself, so `buildatlas login` can validate a token before it
|
|
@@ -40,6 +88,7 @@ export async function apiRequest(config, path, init = {}) {
|
|
|
40
88
|
...rest.headers,
|
|
41
89
|
},
|
|
42
90
|
});
|
|
91
|
+
reportVersionSkew(res, config.apiUrl);
|
|
43
92
|
if (mode === 'safe' && retryable(res.status) && attempt < BACKOFF_MS.length) {
|
|
44
93
|
await delay(BACKOFF_MS[attempt]);
|
|
45
94
|
continue;
|
|
@@ -49,6 +98,10 @@ export async function apiRequest(config, path, init = {}) {
|
|
|
49
98
|
// No response at all: the connection failed, so for a `once` request we cannot
|
|
50
99
|
// know whether the server acted on it. Reported rather than repeated.
|
|
51
100
|
if (mode !== 'safe' || attempt >= BACKOFF_MS.length) {
|
|
101
|
+
// A bare "fetch failed" sends people looking at their own network when the
|
|
102
|
+
// real cause is usually no session at all rather than connectivity.
|
|
103
|
+
if (!token)
|
|
104
|
+
throw new Error('Not logged in. Run `buildatlas login` first.');
|
|
52
105
|
throw new AtlasApiError(0, 'network_error', `Could not reach ${new URL(config.apiUrl).host} (${err.message}).`);
|
|
53
106
|
}
|
|
54
107
|
await delay(BACKOFF_MS[attempt]);
|
|
@@ -56,6 +109,9 @@ export async function apiRequest(config, path, init = {}) {
|
|
|
56
109
|
}
|
|
57
110
|
break;
|
|
58
111
|
}
|
|
112
|
+
if (res.status === 401) {
|
|
113
|
+
throw new AtlasApiError(401, 'unauthorized', 'Not logged in. Run `buildatlas login` first.');
|
|
114
|
+
}
|
|
59
115
|
if (res.status === 204)
|
|
60
116
|
return undefined;
|
|
61
117
|
if (raw) {
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/client.test.js
CHANGED
|
@@ -99,4 +99,60 @@ describe('apiRequest', () => {
|
|
|
99
99
|
});
|
|
100
100
|
});
|
|
101
101
|
});
|
|
102
|
+
describe('telling a developer their CLI is behind', () => {
|
|
103
|
+
it('warns once, not once per request', async () => {
|
|
104
|
+
// The alternative trains people to ignore it. A build makes dozens of calls.
|
|
105
|
+
const warnings = [];
|
|
106
|
+
const write = process.stderr.write.bind(process.stderr);
|
|
107
|
+
process.stderr.write = (chunk) => {
|
|
108
|
+
warnings.push(String(chunk));
|
|
109
|
+
return true;
|
|
110
|
+
};
|
|
111
|
+
const server = createServer((_req, res) => {
|
|
112
|
+
res.setHeader('x-buildatlas-cli-latest', '99.0.0');
|
|
113
|
+
res.setHeader('content-type', 'application/json');
|
|
114
|
+
res.end('{}');
|
|
115
|
+
});
|
|
116
|
+
await new Promise((r) => server.listen(0, r));
|
|
117
|
+
const { port } = server.address();
|
|
118
|
+
const config = { apiUrl: `http://127.0.0.1:${port}` };
|
|
119
|
+
try {
|
|
120
|
+
await apiRequest(config, '/one');
|
|
121
|
+
await apiRequest(config, '/two');
|
|
122
|
+
await apiRequest(config, '/three');
|
|
123
|
+
}
|
|
124
|
+
finally {
|
|
125
|
+
process.stderr.write = write;
|
|
126
|
+
server.close();
|
|
127
|
+
}
|
|
128
|
+
const skew = warnings.filter((w) => w.includes('This CLI is'));
|
|
129
|
+
assert.equal(skew.length, 1, 'said once for three requests');
|
|
130
|
+
assert.match(skew[0], /99\.0\.0/);
|
|
131
|
+
// And it points at this instance's own copy, which needs no registry auth.
|
|
132
|
+
assert.match(skew[0], /\/cli\/buildatlas\.tgz/);
|
|
133
|
+
});
|
|
134
|
+
it('says nothing when the server does not send the header', async () => {
|
|
135
|
+
// An older API has no opinion about CLI versions; silence is the right answer.
|
|
136
|
+
const warnings = [];
|
|
137
|
+
const write = process.stderr.write.bind(process.stderr);
|
|
138
|
+
process.stderr.write = (chunk) => {
|
|
139
|
+
warnings.push(String(chunk));
|
|
140
|
+
return true;
|
|
141
|
+
};
|
|
142
|
+
const server = createServer((_req, res) => {
|
|
143
|
+
res.setHeader('content-type', 'application/json');
|
|
144
|
+
res.end('{}');
|
|
145
|
+
});
|
|
146
|
+
await new Promise((r) => server.listen(0, r));
|
|
147
|
+
const { port } = server.address();
|
|
148
|
+
try {
|
|
149
|
+
await apiRequest({ apiUrl: `http://127.0.0.1:${port}` }, '/x');
|
|
150
|
+
}
|
|
151
|
+
finally {
|
|
152
|
+
process.stderr.write = write;
|
|
153
|
+
server.close();
|
|
154
|
+
}
|
|
155
|
+
assert.equal(warnings.filter((w) => w.includes('This CLI is')).length, 0);
|
|
156
|
+
});
|
|
157
|
+
});
|
|
102
158
|
//# sourceMappingURL=client.test.js.map
|
package/dist/client.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../src/client.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAe,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../src/client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2GzC,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC5F;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsD3D"}
|
package/dist/commands/build.js
CHANGED
|
@@ -39,6 +39,36 @@ async function gitInfo(cwd) {
|
|
|
39
39
|
gitCommitMessage: subject,
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* Which branch `--git` means.
|
|
44
|
+
*
|
|
45
|
+
* A bare `--git` builds the branch you are on, because that is what somebody standing in
|
|
46
|
+
* a checkout means by it. Outside a checkout there is nothing to infer from, and
|
|
47
|
+
* guessing `main` would build something other than what was asked for — so it asks.
|
|
48
|
+
*/
|
|
49
|
+
/** Packs the working tree, announcing the size the way the upload path always has. */
|
|
50
|
+
async function packSource(projectDir) {
|
|
51
|
+
process.stdout.write(pc.dim('packing project… '));
|
|
52
|
+
const tarball = await packProject(projectDir);
|
|
53
|
+
console.log(pc.dim(`${(tarball.sizeBytes / 1024 / 1024).toFixed(1)} MB`));
|
|
54
|
+
return tarball;
|
|
55
|
+
}
|
|
56
|
+
async function resolveGitBranch(cwd, flag) {
|
|
57
|
+
if (typeof flag === 'string' && flag.trim())
|
|
58
|
+
return flag.trim();
|
|
59
|
+
let branch;
|
|
60
|
+
try {
|
|
61
|
+
branch = (await exec('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd })).stdout.trim();
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
throw new Error('This directory is not a git checkout, so there is no branch to infer. ' +
|
|
65
|
+
'Name one: `ba build --git <branch>`.');
|
|
66
|
+
}
|
|
67
|
+
if (!branch || branch === 'HEAD') {
|
|
68
|
+
throw new Error('You are not on a branch (detached HEAD). Name one: `ba build --git <branch>`.');
|
|
69
|
+
}
|
|
70
|
+
return branch;
|
|
71
|
+
}
|
|
42
72
|
/**
|
|
43
73
|
* Checks the profile exists before uploading anything.
|
|
44
74
|
*
|
|
@@ -94,6 +124,7 @@ export function registerBuildCommand(program) {
|
|
|
94
124
|
.option('--no-local', 'Build with the legacy eas-cli strategy instead of driving Xcode and Gradle directly. Needs an Expo account and an eas.json.')
|
|
95
125
|
.option('--build-number <n>', 'Use this exact build number, ignoring the descriptor and the counter. For when a store has already taken the next one.')
|
|
96
126
|
.option('--app-version <version>', 'Use this marketing version (CFBundleShortVersionString / versionName) instead of the one in your app config.')
|
|
127
|
+
.option('--git [branch]', "Build the project's configured repository instead of uploading this directory. With no value, uses the branch you are on.")
|
|
97
128
|
.option('--ios-signer <tool>', 'For a signed iOS --local build: "xcodebuild" (default) or "fastlane" (gym). Same signing setup either way; they differ in which tool archives and exports, and in how they fail.')
|
|
98
129
|
.action(async (opts) => {
|
|
99
130
|
try {
|
|
@@ -143,7 +174,37 @@ async function runBuild(opts) {
|
|
|
143
174
|
const resolved = await resolveProject(opts.project, projectDir);
|
|
144
175
|
reportProject(resolved);
|
|
145
176
|
const slug = resolved.slug;
|
|
146
|
-
|
|
177
|
+
/*
|
|
178
|
+
* The two ways source reaches a runner.
|
|
179
|
+
*
|
|
180
|
+
* With --git nothing is packed and nothing is uploaded: the runner clones the
|
|
181
|
+
* project's repository itself, which is the whole point — on a large project the
|
|
182
|
+
* upload is the slowest part of a build and the part most likely to fail.
|
|
183
|
+
*
|
|
184
|
+
* Checked against the server first so "that project has no repository configured"
|
|
185
|
+
* arrives immediately, rather than after the build row already exists.
|
|
186
|
+
*/
|
|
187
|
+
const gitBranch = opts.git === undefined || opts.git === false
|
|
188
|
+
? null
|
|
189
|
+
: await resolveGitBranch(projectDir, opts.git);
|
|
190
|
+
if (gitBranch) {
|
|
191
|
+
const status = await apiRequest(config, `/projects/${slug}/git/status`, {
|
|
192
|
+
token: config.token,
|
|
193
|
+
});
|
|
194
|
+
if (!status.configured) {
|
|
195
|
+
throw new Error(`${status.reason ?? 'This project cannot build from git.'}\n` +
|
|
196
|
+
' Set the repository on the project (dashboard → Project → Details → Repository).');
|
|
197
|
+
}
|
|
198
|
+
console.log(pc.dim(`building ${status.fullName ?? 'the configured repository'} @ ${gitBranch} — nothing uploaded`));
|
|
199
|
+
}
|
|
200
|
+
// Only the uploaded path builds what is in this directory. With --git the profile,
|
|
201
|
+
// the project type and the eas.json env all come from the repository the runner
|
|
202
|
+
// clones — reading them here would validate the wrong tree, and on a laptop sitting
|
|
203
|
+
// in some other project it would reject a profile that exists perfectly well in the
|
|
204
|
+
// one being built.
|
|
205
|
+
if (!gitBranch) {
|
|
206
|
+
await assertProfileExists(projectDir, opts.profile);
|
|
207
|
+
}
|
|
147
208
|
if (opts.iosSigner && opts.iosSigner !== 'xcodebuild' && opts.iosSigner !== 'fastlane') {
|
|
148
209
|
throw new Error('--ios-signer must be "xcodebuild" or "fastlane"');
|
|
149
210
|
}
|
|
@@ -163,7 +224,7 @@ async function runBuild(opts) {
|
|
|
163
224
|
if (opts.iosSigner && opts.platform !== 'ios') {
|
|
164
225
|
throw new Error('--ios-signer only applies to --platform ios.');
|
|
165
226
|
}
|
|
166
|
-
if (opts.local) {
|
|
227
|
+
if (opts.local && !gitBranch) {
|
|
167
228
|
// Best-effort: a native build's actual env still comes from the worker
|
|
168
229
|
// reading eas.json directly, so a failure here (e.g. a non-admin token —
|
|
169
230
|
// setting env requires admin) must never block the build itself.
|
|
@@ -183,14 +244,12 @@ async function runBuild(opts) {
|
|
|
183
244
|
console.log(pc.dim(`(could not seed dashboard env vars from eas.json: ${err.message})`));
|
|
184
245
|
}
|
|
185
246
|
}
|
|
186
|
-
|
|
187
|
-
const tarball = await packProject(projectDir);
|
|
188
|
-
console.log(pc.dim(`${(tarball.sizeBytes / 1024 / 1024).toFixed(1)} MB`));
|
|
247
|
+
const tarball = gitBranch ? null : await packSource(projectDir);
|
|
189
248
|
// An oversized upload is invisible exactly when it matters. A Flutter app shipped
|
|
190
249
|
// 1,175 MB and the only symptom was a build that sat in "Fetch source" for an hour and
|
|
191
250
|
// sixteen minutes — on a link from Addis, uphill both ways, for a two-minute build.
|
|
192
251
|
// Said here, before the upload, where it is still cheap to fix.
|
|
193
|
-
if (tarball.sizeBytes > LARGE_UPLOAD_BYTES) {
|
|
252
|
+
if (tarball && tarball.sizeBytes > LARGE_UPLOAD_BYTES) {
|
|
194
253
|
console.log(pc.yellow('!'), `That is a large upload. It is sent to storage now and downloaded again by the runner,\n so it is paid for twice on every build.`);
|
|
195
254
|
for (const entry of tarball.largest) {
|
|
196
255
|
console.log(pc.dim(` ${(entry.bytes / 1024 / 1024).toFixed(0)} MB ${entry.path}`));
|
|
@@ -200,13 +259,17 @@ async function runBuild(opts) {
|
|
|
200
259
|
}
|
|
201
260
|
// Said before the build starts, not after it fails ten minutes later. The runner
|
|
202
261
|
// cannot detect this — from its side the file simply does not exist.
|
|
203
|
-
for (const name of tarball
|
|
262
|
+
for (const name of tarball?.excludedButRelevant ?? []) {
|
|
204
263
|
console.log(pc.yellow('!'), `${name} is excluded by your ignore rules, so the runner will not see it.`);
|
|
205
264
|
console.log(pc.dim(` It affects how dependencies install. If it holds no secrets, add "!${name}" to ` +
|
|
206
265
|
'.easignore so it is uploaded.'));
|
|
207
266
|
}
|
|
208
267
|
try {
|
|
209
|
-
|
|
268
|
+
// Recorded from the local checkout only when the local checkout is what is being
|
|
269
|
+
// built. For a --git build the laptop's HEAD is not the source, and sending its sha
|
|
270
|
+
// would put a plausible, wrong commit on the build row; the runner reports the real
|
|
271
|
+
// one after it clones.
|
|
272
|
+
const git = gitBranch ? { gitRef: gitBranch } : await gitInfo(projectDir);
|
|
210
273
|
const { build, uploadUrl } = await apiRequest(config, `/projects/${slug}/builds`, {
|
|
211
274
|
method: 'POST',
|
|
212
275
|
token: config.token,
|
|
@@ -217,20 +280,22 @@ async function runBuild(opts) {
|
|
|
217
280
|
...(opts.iosSigner ? { iosSigner: opts.iosSigner } : {}),
|
|
218
281
|
...(opts.buildNumber ? { buildNumber: Number(opts.buildNumber) } : {}),
|
|
219
282
|
...(opts.appVersion ? { appVersion: opts.appVersion } : {}),
|
|
220
|
-
sourceSha256: tarball.sha256,
|
|
283
|
+
...(gitBranch ? { sourceKind: 'git' } : { sourceSha256: tarball.sha256 }),
|
|
221
284
|
retainWorkdir: opts.retainWorkdir ?? false,
|
|
222
285
|
// Sent so the server can route the build while it is still queued: a Flutter
|
|
223
286
|
// build is only buildable on a runner with the Flutter SDK, and nothing looks
|
|
224
287
|
// at the source until a runner has already claimed it. Advisory — the worker
|
|
225
288
|
// reads the tree itself and corrects this.
|
|
226
|
-
...(await detectedProjectType(projectDir)),
|
|
289
|
+
...(gitBranch ? {} : await detectedProjectType(projectDir)),
|
|
227
290
|
...git,
|
|
228
291
|
}),
|
|
229
292
|
});
|
|
230
293
|
console.log(`${pc.green('✔')} build ${pc.bold(build.id)} created · ${build.platform} · ${build.profile} · build number ${build.buildNumber}`);
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
294
|
+
if (tarball && uploadUrl) {
|
|
295
|
+
process.stdout.write(pc.dim('uploading source… '));
|
|
296
|
+
await uploadTarball(uploadUrl, tarball.path, tarball.sizeBytes);
|
|
297
|
+
console.log(pc.dim('done'));
|
|
298
|
+
}
|
|
234
299
|
// Retried, unlike the create above: the build row and its source already exist,
|
|
235
300
|
// and enqueueing it twice queues the same build. Losing this call after a source
|
|
236
301
|
// upload that took minutes leaves a build that exists and will never run.
|
|
@@ -258,8 +323,8 @@ async function runBuild(opts) {
|
|
|
258
323
|
}
|
|
259
324
|
finally {
|
|
260
325
|
// The tarball is a temp file; leaving copies of source archives in /tmp on
|
|
261
|
-
// every developer's laptop is not acceptable.
|
|
262
|
-
await tarball
|
|
326
|
+
// every developer's laptop is not acceptable. (A --git build packed nothing.)
|
|
327
|
+
await tarball?.cleanup();
|
|
263
328
|
}
|
|
264
329
|
}
|
|
265
330
|
async function uploadTarball(url, path, size) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Prompter } from '../prompt.ts';
|
|
2
|
-
export type WizardKind = 'android_keystore' | 'ios_dist_cert' | 'ios_provisioning_profile' | 'asc_api_key' | 'play_service_account';
|
|
2
|
+
export type WizardKind = 'android_keystore' | 'ios_dist_cert' | 'ios_provisioning_profile' | 'asc_api_key' | 'play_service_account' | 'ios_push_key';
|
|
3
3
|
export interface WizardResult {
|
|
4
4
|
kind: WizardKind;
|
|
5
5
|
label: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials-wizard.d.ts","sourceRoot":"","sources":["../../src/commands/credentials-wizard.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C,MAAM,MAAM,UAAU,GAClB,kBAAkB,GAClB,eAAe,GACf,0BAA0B,GAC1B,aAAa,GACb,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"credentials-wizard.d.ts","sourceRoot":"","sources":["../../src/commands/credentials-wizard.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAI7C,MAAM,MAAM,UAAU,GAClB,kBAAkB,GAClB,eAAe,GACf,0BAA0B,GAC1B,aAAa,GACb,sBAAsB,GACtB,cAAc,CAAC;AAEnB,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,oBAAoB,CACxC,CAAC,EAAE,QAAQ,EACX,QAAQ,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GACxB,OAAO,CAAC,YAAY,CAAC,CAgDvB"}
|
|
@@ -46,6 +46,11 @@ export async function runCredentialsWizard(p, defaults) {
|
|
|
46
46
|
label: 'Google Play service account',
|
|
47
47
|
hint: '.json, for store submission',
|
|
48
48
|
},
|
|
49
|
+
{
|
|
50
|
+
value: 'ios_push_key',
|
|
51
|
+
label: 'iOS push notification key (APNs)',
|
|
52
|
+
hint: '.p8, for push notifications — including through OneSignal',
|
|
53
|
+
},
|
|
49
54
|
]);
|
|
50
55
|
switch (kind) {
|
|
51
56
|
case 'android_keystore':
|
|
@@ -58,6 +63,8 @@ export async function runCredentialsWizard(p, defaults) {
|
|
|
58
63
|
return ascApiKey(p, defaults.dir);
|
|
59
64
|
case 'play_service_account':
|
|
60
65
|
return playServiceAccount(p, defaults.dir);
|
|
66
|
+
case 'ios_push_key':
|
|
67
|
+
return iosPushKey(p, defaults.dir);
|
|
61
68
|
}
|
|
62
69
|
}
|
|
63
70
|
/** Asks for a path until it points at something readable. */
|
|
@@ -261,6 +268,19 @@ async function ascApiKey(p, dir) {
|
|
|
261
268
|
payload: { p8Base64: await base64(path), keyId, issuerId },
|
|
262
269
|
};
|
|
263
270
|
}
|
|
271
|
+
async function iosPushKey(p, dir) {
|
|
272
|
+
console.log(pc.dim('\nFrom developer.apple.com → Certificates, IDs & Profiles → Keys → a key with the' +
|
|
273
|
+
'\n"Apple Push Notifications service (APNs)" capability. Apple lets you download the .p8' +
|
|
274
|
+
'\nonce — the same key is what you would upload to OneSignal’s dashboard for iOS push.'));
|
|
275
|
+
const path = await askForFile(p, 'Path to the .p8 key file', dir);
|
|
276
|
+
const keyId = await p.ask('Key ID');
|
|
277
|
+
const label = await p.ask('Label', { default: `Push key ${keyId}` });
|
|
278
|
+
return {
|
|
279
|
+
kind: 'ios_push_key',
|
|
280
|
+
label,
|
|
281
|
+
payload: { p8Base64: await base64(path), keyId },
|
|
282
|
+
};
|
|
283
|
+
}
|
|
264
284
|
async function playServiceAccount(p, dir) {
|
|
265
285
|
console.log(pc.dim('\nFrom Google Cloud console → IAM → Service Accounts → Keys → Add key (JSON).'));
|
|
266
286
|
const path = await askForFile(p, 'Path to the service account .json', dir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials-wizard.js","sourceRoot":"","sources":["../../src/commands/credentials-wizard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGhF,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"credentials-wizard.js","sourceRoot":"","sources":["../../src/commands/credentials-wizard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/commands/credentials.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/commands/credentials.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuIzC,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkMjE"}
|
|
@@ -73,6 +73,14 @@ async function buildPayload(kind, opts, ask) {
|
|
|
73
73
|
throw new Error('--file <service-account.json> is required');
|
|
74
74
|
return { serviceAccountJson: await readFile(opts.file, 'utf8') };
|
|
75
75
|
}
|
|
76
|
+
case 'ios_push_key': {
|
|
77
|
+
if (!opts.file)
|
|
78
|
+
throw new Error('--file <AuthKey_XXX.p8> is required for ios_push_key');
|
|
79
|
+
return {
|
|
80
|
+
p8Base64: await b64(opts.file),
|
|
81
|
+
keyId: opts.keyId ?? (await ask('APNs key id: ')),
|
|
82
|
+
};
|
|
83
|
+
}
|
|
76
84
|
case 'expo_token':
|
|
77
85
|
throw new Error('Expo tokens moved to `buildatlas expo-tokens add` — they are usually shared by every project, which a per-project credential cannot express.');
|
|
78
86
|
default:
|
|
@@ -136,14 +144,14 @@ export function registerCredentialCommands(program) {
|
|
|
136
144
|
.description('Upload a credential into the vault')
|
|
137
145
|
// Not required: omitting it starts the interactive wizard. The flags remain
|
|
138
146
|
// the path CI uses, where prompting would hang.
|
|
139
|
-
.option('-k, --kind <kind>', 'ios_dist_cert | ios_provisioning_profile | android_keystore | asc_api_key | play_service_account. Omit to be asked.')
|
|
147
|
+
.option('-k, --kind <kind>', 'ios_dist_cert | ios_provisioning_profile | android_keystore | asc_api_key | play_service_account | ios_push_key. Omit to be asked.')
|
|
140
148
|
.option('-f, --file <path>', 'Path to the credential file')
|
|
141
149
|
.option('-l, --label <label>', 'Human-readable label')
|
|
142
150
|
.option('--alias <alias>', 'Keystore key alias')
|
|
143
|
-
.option('--key-id <id>', 'App Store Connect key id')
|
|
151
|
+
.option('--key-id <id>', 'App Store Connect or APNs push key id')
|
|
144
152
|
.option('--issuer-id <id>', 'App Store Connect issuer id')
|
|
145
153
|
.option('--project <slug>', 'Project slug (default: $BUILDATLAS_PROJECT, else app.json)')
|
|
146
|
-
.option('--account', 'Share with every project. Only for a distribution certificate, ASC key
|
|
154
|
+
.option('--account', 'Share with every project. Only for a distribution certificate, ASC key, Play service account or push key.')
|
|
147
155
|
.action(async (opts) => {
|
|
148
156
|
try {
|
|
149
157
|
const config = await requireAuth();
|