Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/percy/cli into PPLT_3718
Browse files Browse the repository at this point in the history
  • Loading branch information
amandeepsingh333 committed Feb 3, 2025
2 parents 360a003 + a76ee38 commit 291fa07
Show file tree
Hide file tree
Showing 37 changed files with 1,610 additions and 73 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
${{ hashFiles('.github/.cache-key') }}/
- run: yarn
- run: yarn build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dist
path: packages/*/dist
Expand Down Expand Up @@ -56,6 +56,7 @@ jobs:
- '@percy/cli-config'
- '@percy/sdk-utils'
- '@percy/webdriver-utils'
- '@percy/monitoring'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -75,7 +76,7 @@ jobs:
restore-keys: >
${{ runner.os }}/node-${{ matrix.node }}/
${{ hashFiles('.github/.cache-key') }}/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: dist
path: packages
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
${{ hashFiles('.github/.cache-key') }}/
- run: yarn
- run: yarn build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dist
path: packages/*/dist
Expand All @@ -55,6 +55,7 @@ jobs:
- '@percy/cli-config'
- '@percy/sdk-utils'
- '@percy/webdriver-utils'
- '@percy/monitoring'
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -74,7 +75,7 @@ jobs:
restore-keys: >
${{ runner.os }}/node-14/
${{ hashFiles('.github/.cache-key') }}/
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: dist
path: packages
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.30.7-beta.2",
"version": "1.30.7",
"packages": [
"packages/*"
],
Expand Down
8 changes: 4 additions & 4 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.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand All @@ -33,7 +33,7 @@
]
},
"dependencies": {
"@percy/cli-command": "1.30.7-beta.2",
"@percy/cli-exec": "1.30.7-beta.2"
"@percy/cli-command": "1.30.7",
"@percy/cli-exec": "1.30.7"
}
}
6 changes: 3 additions & 3 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.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand All @@ -33,6 +33,6 @@
]
},
"dependencies": {
"@percy/cli-command": "1.30.7-beta.2"
"@percy/cli-command": "1.30.7"
}
}
10 changes: 5 additions & 5 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.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"files": [
"dist",
Expand All @@ -36,8 +36,8 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/config": "1.30.7-beta.2",
"@percy/core": "1.30.7-beta.2",
"@percy/logger": "1.30.7-beta.2"
"@percy/config": "1.30.7",
"@percy/core": "1.30.7",
"@percy/logger": "1.30.7"
}
}
6 changes: 3 additions & 3 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.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand All @@ -33,6 +33,6 @@
]
},
"dependencies": {
"@percy/cli-command": "1.30.7-beta.2"
"@percy/cli-command": "1.30.7"
}
}
8 changes: 4 additions & 4 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.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand All @@ -33,8 +33,8 @@
]
},
"dependencies": {
"@percy/cli-command": "1.30.7-beta.2",
"@percy/logger": "1.30.7-beta.2",
"@percy/cli-command": "1.30.7",
"@percy/logger": "1.30.7",
"cross-spawn": "^7.0.3",
"which": "^2.0.2"
}
Expand Down
5 changes: 4 additions & 1 deletion packages/cli-exec/test/exec.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import exec from '@percy/cli-exec';
describe('percy exec', () => {
beforeEach(async () => {
process.env.PERCY_TOKEN = '<<PERCY_TOKEN>>';
// due to lot of start calls, it slows spec to finish
// therefore disabling it
process.env.PERCY_DISABLE_SYSTEM_MONITORING = 'true';
process.env.PERCY_FORCE_PKG_VALUE = JSON.stringify({ name: '@percy/client', version: '1.0.0' });
jasmine.DEFAULT_TIMEOUT_INTERVAL = 25000;
await setupTest();
Expand All @@ -24,6 +27,7 @@ describe('percy exec', () => {
delete process.env.PERCY_PARALLEL_TOTAL;
delete process.env.PERCY_PARTIAL_BUILD;
delete process.env.PERCY_CLIENT_ERROR_LOGS;
delete process.env.PERCY_DISABLE_SYSTEM_MONITORING;
});

describe('projectType is app', () => {
Expand Down Expand Up @@ -277,7 +281,6 @@ describe('percy exec', () => {
'setTimeout(() => process.exit(1), 5000)'
)]);

// wait until the process starts
await new Promise(r => setTimeout(r, 1000));
expect(logger.stdout).toEqual(jasmine.arrayContaining([
jasmine.stringContaining('[percy] Running "node --eval ')
Expand Down
4 changes: 4 additions & 0 deletions packages/cli-exec/test/start.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ describe('percy exec:start', () => {

beforeEach(async () => {
process.env.PERCY_TOKEN = '<<PERCY_TOKEN>>';

// disabling as it increases spec time and logs system info
process.env.PERCY_DISABLE_SYSTEM_MONITORING = 'true';
process.env.PERCY_FORCE_PKG_VALUE = JSON.stringify({ name: '@percy/client', version: '1.0.0' });
await setupTest();

Expand All @@ -29,6 +32,7 @@ describe('percy exec:start', () => {
delete process.env.PERCY_ENABLE;
delete process.env.PERCY_PARALLEL_TOTAL;
delete process.env.PERCY_PARTIAL_BUILD;
delete process.env.PERCY_DISABLE_SYSTEM_MONITORING;

// it's important that percy is still running or we terminate the test process
if (started) process.emit('SIGTERM');
Expand Down
6 changes: 3 additions & 3 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.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand All @@ -33,7 +33,7 @@
]
},
"dependencies": {
"@percy/cli-command": "1.30.7-beta.2",
"@percy/cli-command": "1.30.7",
"yaml": "^2.0.0"
}
}
6 changes: 3 additions & 3 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.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand All @@ -33,7 +33,7 @@
]
},
"dependencies": {
"@percy/cli-command": "1.30.7-beta.2",
"@percy/cli-command": "1.30.7",
"fast-glob": "^3.2.11",
"image-size": "^1.0.0"
}
Expand Down
22 changes: 11 additions & 11 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/cli",
"version": "1.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"files": [
"bin",
Expand All @@ -31,14 +31,14 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/cli-app": "1.30.7-beta.2",
"@percy/cli-build": "1.30.7-beta.2",
"@percy/cli-command": "1.30.7-beta.2",
"@percy/cli-config": "1.30.7-beta.2",
"@percy/cli-exec": "1.30.7-beta.2",
"@percy/cli-snapshot": "1.30.7-beta.2",
"@percy/cli-upload": "1.30.7-beta.2",
"@percy/client": "1.30.7-beta.2",
"@percy/logger": "1.30.7-beta.2"
"@percy/cli-app": "1.30.7",
"@percy/cli-build": "1.30.7",
"@percy/cli-command": "1.30.7",
"@percy/cli-config": "1.30.7",
"@percy/cli-exec": "1.30.7",
"@percy/cli-snapshot": "1.30.7",
"@percy/cli-upload": "1.30.7",
"@percy/client": "1.30.7",
"@percy/logger": "1.30.7"
}
}
8 changes: 4 additions & 4 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/client",
"version": "1.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand All @@ -33,8 +33,8 @@
"test:coverage": "yarn test --coverage"
},
"dependencies": {
"@percy/env": "1.30.7-beta.2",
"@percy/logger": "1.30.7-beta.2",
"@percy/env": "1.30.7",
"@percy/logger": "1.30.7",
"pac-proxy-agent": "^7.0.2",
"pako": "^2.1.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@percy/config",
"version": "1.30.7-beta.2",
"version": "1.30.7",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -9,7 +9,7 @@
},
"publishConfig": {
"access": "public",
"tag": "beta"
"tag": "latest"
},
"engines": {
"node": ">=14"
Expand Down Expand Up @@ -38,7 +38,7 @@
"test:types": "tsd"
},
"dependencies": {
"@percy/logger": "1.30.7-beta.2",
"@percy/logger": "1.30.7",
"ajv": "^8.6.2",
"cosmiconfig": "^8.0.0",
"yaml": "^2.0.0"
Expand Down
Loading

0 comments on commit 291fa07

Please sign in to comment.