Skip to content

Commit

Permalink
Adding Error Capturing on Finalize Builds (#1818)
Browse files Browse the repository at this point in the history
* Adding Error Capturing on Finalize Builds

* 🔖 v1.31.0-alpha.1

* 🔖 v1.31.0-alpha.2

* Adding prodBuild param for scanner alt env (#1830)

* Adding prodBuild param for scanner alt env

* renaming config

---------

Co-authored-by: rishigupta1599 <114384996+rishigupta1599@users.noreply.github.com>
  • Loading branch information
Amit3200 and rishigupta1599 committed Dec 20, 2024
1 parent 0c55c46 commit 5ee4f67
Show file tree
Hide file tree
Showing 21 changed files with 104 additions and 51 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"packages": [
"packages/*"
],
Expand Down
6 changes: 3 additions & 3 deletions packages/cli-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli-app",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
]
},
"dependencies": {
"@percy/cli-command": "1.31.0-alpha.0",
"@percy/cli-exec": "1.31.0-alpha.0"
"@percy/cli-command": "1.31.0-alpha.2",
"@percy/cli-exec": "1.31.0-alpha.2"
}
}
4 changes: 2 additions & 2 deletions packages/cli-build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli-build",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,6 +33,6 @@
]
},
"dependencies": {
"@percy/cli-command": "1.31.0-alpha.0"
"@percy/cli-command": "1.31.0-alpha.2"
}
}
7 changes: 5 additions & 2 deletions packages/cli-build/src/finalize.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ export const finalize = command('finalize', {

// rely on the parallel nonce to cause the API to return the current running build for the nonce
let { data: build } = await percy.client.createBuild({ cliStartTime: percy.cliStartTime });
await percy.client.finalizeBuild(build.id, { all: true });

try {
await percy.client.finalizeBuild(build.id, { all: true });
} catch (error) {
exit(1, 'Percy build failed during finalize', error.message);
}
let { 'build-number': number, 'web-url': url } = build.attributes;
log.info(`Finalized build #${number}: ${url}`);
});
Expand Down
8 changes: 4 additions & 4 deletions packages/cli-command/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli-command",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -36,8 +36,8 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/config": "1.31.0-alpha.0",
"@percy/core": "1.31.0-alpha.0",
"@percy/logger": "1.31.0-alpha.0"
"@percy/config": "1.31.0-alpha.2",
"@percy/core": "1.31.0-alpha.2",
"@percy/logger": "1.31.0-alpha.2"
}
}
4 changes: 2 additions & 2 deletions packages/cli-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli-config",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,6 +33,6 @@
]
},
"dependencies": {
"@percy/cli-command": "1.31.0-alpha.0"
"@percy/cli-command": "1.31.0-alpha.2"
}
}
6 changes: 3 additions & 3 deletions packages/cli-exec/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli-exec",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,8 +33,8 @@
]
},
"dependencies": {
"@percy/cli-command": "1.31.0-alpha.0",
"@percy/logger": "1.31.0-alpha.0",
"@percy/cli-command": "1.31.0-alpha.2",
"@percy/logger": "1.31.0-alpha.2",
"cross-spawn": "^7.0.3",
"which": "^2.0.2"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/cli-snapshot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli-snapshot",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
]
},
"dependencies": {
"@percy/cli-command": "1.31.0-alpha.0",
"@percy/cli-command": "1.31.0-alpha.2",
"yaml": "^2.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/cli-upload/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli-upload",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
]
},
"dependencies": {
"@percy/cli-command": "1.31.0-alpha.0",
"@percy/cli-command": "1.31.0-alpha.2",
"fast-glob": "^3.2.11",
"image-size": "^1.0.0"
}
Expand Down
20 changes: 10 additions & 10 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -31,14 +31,14 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/cli-app": "1.31.0-alpha.0",
"@percy/cli-build": "1.31.0-alpha.0",
"@percy/cli-command": "1.31.0-alpha.0",
"@percy/cli-config": "1.31.0-alpha.0",
"@percy/cli-exec": "1.31.0-alpha.0",
"@percy/cli-snapshot": "1.31.0-alpha.0",
"@percy/cli-upload": "1.31.0-alpha.0",
"@percy/client": "1.31.0-alpha.0",
"@percy/logger": "1.31.0-alpha.0"
"@percy/cli-app": "1.31.0-alpha.2",
"@percy/cli-build": "1.31.0-alpha.2",
"@percy/cli-command": "1.31.0-alpha.2",
"@percy/cli-config": "1.31.0-alpha.2",
"@percy/cli-exec": "1.31.0-alpha.2",
"@percy/cli-snapshot": "1.31.0-alpha.2",
"@percy/cli-upload": "1.31.0-alpha.2",
"@percy/client": "1.31.0-alpha.2",
"@percy/logger": "1.31.0-alpha.2"
}
}
6 changes: 3 additions & 3 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/client",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,8 +33,8 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/env": "1.31.0-alpha.0",
"@percy/logger": "1.31.0-alpha.0",
"@percy/env": "1.31.0-alpha.2",
"@percy/logger": "1.31.0-alpha.2",
"pako": "^2.1.0"
}
}
3 changes: 2 additions & 1 deletion packages/client/src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ export class PercyClient {
partial: this.env.partial,
tags: tagsArr,
'cli-start-time': cliStartTime,
source: source
source: source,
'skip-base-build': this.config.percy?.skipBaseBuild
},
relationships: {
resources: {
Expand Down
45 changes: 45 additions & 0 deletions packages/client/test/client.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ describe('PercyClient', () => {

describe('#createBuild()', () => {
let cliStartTime = new Date().toISOString();
beforeEach(() => {
delete process.env.PERCY_AUTO_ENABLED_GROUP_BUILD;
});

it('creates a new build', async () => {
await expectAsync(client.createBuild()).toBeResolvedTo({
data: {
Expand Down Expand Up @@ -384,6 +388,47 @@ describe('PercyClient', () => {
}
}));
});

it('creates a new build with skipBaseBuild config', async () => {
client = new PercyClient({
token: 'PERCY_TOKEN',
config: { percy: { skipBaseBuild: true } }
});
await expectAsync(client.createBuild({ projectType: 'web' })).toBeResolvedTo({
data: {
id: '123',
attributes: {
'build-number': 1,
'web-url': 'https://percy.io/test/test/123'
}
}
});

expect(api.requests['/builds'][0].body.data)
.toEqual(jasmine.objectContaining({
attributes: {
branch: client.env.git.branch,
type: 'web',
'target-branch': client.env.target.branch,
'target-commit-sha': client.env.target.commit,
'commit-sha': client.env.git.sha,
'commit-committed-at': client.env.git.committedAt,
'commit-author-name': client.env.git.authorName,
'commit-author-email': client.env.git.authorEmail,
'commit-committer-name': client.env.git.committerName,
'commit-committer-email': client.env.git.committerEmail,
'commit-message': client.env.git.message,
'pull-request-number': client.env.pullRequest,
'parallel-nonce': client.env.parallel.nonce,
'parallel-total-shards': client.env.parallel.total,
'cli-start-time': null,
source: 'user_created',
partial: client.env.partial,
'skip-base-build': true,
tags: []
}
}));
});
});

describe('#getBuild()', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/config",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -38,7 +38,7 @@
"test:types": "tsd"
},
"dependencies": {
"@percy/logger": "1.31.0-alpha.0",
"@percy/logger": "1.31.0-alpha.2",
"ajv": "^8.6.2",
"cosmiconfig": "^8.0.0",
"yaml": "^2.0.0"
Expand Down
12 changes: 6 additions & 6 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/core",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,11 +43,11 @@
"test:types": "tsd"
},
"dependencies": {
"@percy/client": "1.31.0-alpha.0",
"@percy/config": "1.31.0-alpha.0",
"@percy/dom": "1.31.0-alpha.0",
"@percy/logger": "1.31.0-alpha.0",
"@percy/webdriver-utils": "1.31.0-alpha.0",
"@percy/client": "1.31.0-alpha.2",
"@percy/config": "1.31.0-alpha.2",
"@percy/dom": "1.31.0-alpha.2",
"@percy/logger": "1.31.0-alpha.2",
"@percy/webdriver-utils": "1.31.0-alpha.2",
"content-disposition": "^0.5.4",
"cross-spawn": "^7.0.3",
"extract-zip": "^2.0.1",
Expand Down
4 changes: 4 additions & 0 deletions packages/core/src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ export const configSchema = {
},
labels: {
type: 'string'
},
skipBaseBuild: {
type: 'boolean',
default: false
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/dom/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/dom",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/env/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/env",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -32,6 +32,6 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/logger": "1.31.0-alpha.0"
"@percy/logger": "1.31.0-alpha.2"
}
}
2 changes: 1 addition & 1 deletion packages/logger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/logger",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/sdk-utils",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/webdriver-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/webdriver-utils",
"version": "1.31.0-alpha.0",
"version": "1.31.0-alpha.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -29,7 +29,7 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/config": "1.31.0-alpha.0",
"@percy/sdk-utils": "1.31.0-alpha.0"
"@percy/config": "1.31.0-alpha.2",
"@percy/sdk-utils": "1.31.0-alpha.2"
}
}

0 comments on commit 5ee4f67

Please # to comment.