Skip to content

Commit 36acf41

Browse files
committed
chore: outputs-setup
changes outputs for e2e suites to be in .playwright of project root updates dynamic changesets to save ci computation update eslint ignore files
1 parent 26f6855 commit 36acf41

File tree

10 files changed

+23
-15
lines changed

10 files changed

+23
-15
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
# This line enables distribution
2727
# The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
28-
- run: pnpm dlx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci" --verbose
28+
- run: pnpm dlx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yml" --stop-agents-after="e2e-ci" --verbose
2929

3030
- run: pnpm exec playwright install
3131

@@ -46,6 +46,5 @@ jobs:
4646
with:
4747
name: playwright-report
4848
path: |
49-
./dist/.playwright/**
50-
./dist/**
49+
./**/.playwright/**
5150
retention-days: 30

.github/workflows/publish.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
# This line enables distribution
3939
# The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e-ci" targets have been requested
40-
- run: pnpm dlx nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="e2e-ci" --verbose
40+
- run: pnpm dlx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yml" --stop-agents-after="e2e-ci" --verbose
4141

4242
- run: pnpm exec playwright install
4343

@@ -55,8 +55,7 @@ jobs:
5555
with:
5656
name: playwright-report
5757
path: |
58-
./dist/.playwright/**
59-
./dist/**
58+
./**/.playwright/**
6059
retention-days: 30
6160

6261
- run: git status
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
distribute-on:
2-
small-changeset: 3 linux-medium-js
3-
medium-changeset: 6 linux-medium-js
4-
large-changeset: 10 linux-medium-js
2+
small-changeset: 3 linux-medium-js # Distribute on small if 1-25% of projects affected in PR
3+
medium-changeset: 6 linux-medium-js # Distribute on medium if 26-50% of projects affected in PR
4+
large-changeset: 10 linux-medium-js # Distribute on large if 51-75% of projects affected in PR
5+
extra-large-changeset: 15 linux-medium-js # Distribute on extra-large if 76-100% of projects affected in PR

e2e/autoscript-suites/.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ LICENSE
66
.bin
77
dist
88
.eslintignore
9-
*.html
9+
*.html
10+
.playwright/

e2e/autoscript-suites/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as os from 'os';
2-
import { PlaywrightTestConfig } from '@playwright/test';
32
import { nxE2EPreset } from '@nx/playwright/preset';
43
import { workspaceRoot } from '@nx/devkit';
54
import { fileURLToPath } from 'url';
@@ -13,8 +12,9 @@ const baseConfig = nxE2EPreset(__filename, {
1312
testDir: './src/suites',
1413
});
1514

16-
const config: PlaywrightTestConfig = {
15+
const config = {
1716
...baseConfig,
17+
outputDir: './.playwright',
1818
reporter: process.env.CI ? 'github' : 'list',
1919
testIgnore: '**/authz-txn*',
2020
use: {

e2e/davinci-suites/.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
.playwright/
12
node_modules
23
*.md
34
LICENSE
45
.babelrc
56
.env*
67
.bin
78
dist
8-
.eslintignore
9+
.eslintignore

e2e/davinci-suites/playwright.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const baseConfig = nxE2EPreset(__filename, {
1414

1515
const config: PlaywrightTestConfig = {
1616
...baseConfig,
17+
outputDir: './.playwright',
1718
reporter: process.env.CI ? 'github' : 'list',
1819
timeout: 30000,
1920
use: {

e2e/token-vault-suites/.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ LICENSE
55
.env*
66
.bin
77
dist
8-
.eslintignore
8+
.eslintignore
9+
./.playwright

e2e/token-vault-suites/playwright.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const baseConfig = nxE2EPreset(__filename, {
1414

1515
const config: PlaywrightTestConfig = {
1616
...baseConfig,
17+
outputDir: './.playwright',
1718
reporter: process.env.CI ? 'github' : 'list',
1819
timeout: 30000,
1920
use: {

nx.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"e2e": {
3030
"dependsOn": ["^build"],
3131
"inputs": ["noMarkdown", "^noMarkdown"],
32+
"outputs": ["{projectRoot}/.playwright"],
3233
"cache": true
3334
},
3435
"build": {
@@ -57,16 +58,19 @@
5758
"@nx/playwright:run": {
5859
"dependsOn": ["^build"],
5960
"inputs": ["noMarkdown", "^noMarkdown"],
61+
"outputs": ["{projectRoot}/.playwright"],
6062
"cache": true
6163
},
6264
"@nx/esbuild:esbuild": {
6365
"dependsOn": ["^build"],
6466
"cache": true,
65-
"inputs": ["noMarkdown", "^noMarkdown"]
67+
"inputs": ["noMarkdown", "^noMarkdown"],
68+
"outputs": ["{projectRoot}/dist"]
6669
},
6770
"e2e-ci--**/*": {
6871
"dependsOn": ["^build"],
6972
"inputs": ["noMarkdown", "^noMarkdown"],
73+
"outputs": ["{projectRoot}/.playwright"],
7074
"cache": true
7175
},
7276
"@nx/js:tsc": {

0 commit comments

Comments
 (0)