From 493414bcc258e714bcda722d76e37eae7b968a4c Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:51:06 +0200 Subject: [PATCH 01/35] Try out windows test in CI --- .circleci/config.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64fea16d4e4..b39c63b6d1f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,6 +167,29 @@ jobs: path: test-results destination: playwright-test-results + test_windows: + executor: win/default + environment: + NODE_ENV: test + TOOLPAD_TEST_RETRIES: 1 + parameters: + browsers: true + + steps: + - checkout + - install_js + - run: + name: 'Build packages' + command: yarn release:build + - save_cache: + name: Save Next.js cache + key: v0-next-{{ checksum "yarn.lock" }} + paths: + - packages/toolpad-app/.next/cache + - run: + name: Tests real browser + command: yarn test:integration --grep backend-basic --project chromium + workflows: pipeline: jobs: From 027e2703408f064a35cace1bd4d14d7a080222bf Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:08:05 +0200 Subject: [PATCH 02/35] Update config.yml --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b39c63b6d1f..2d562c75255 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -172,8 +172,6 @@ jobs: environment: NODE_ENV: test TOOLPAD_TEST_RETRIES: 1 - parameters: - browsers: true steps: - checkout @@ -206,3 +204,7 @@ workflows: - test_unit: requires: - checkout + - test_windows: + requires: + - checkout + browsers: true From a65e0eea1536ff603b9fb70c44de0765c5b9a277 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:12:58 +0200 Subject: [PATCH 03/35] Update index.spec.ts --- test/integration/rest-basic/index.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/rest-basic/index.spec.ts b/test/integration/rest-basic/index.spec.ts index fceaac68f0d..26224d6404a 100644 --- a/test/integration/rest-basic/index.spec.ts +++ b/test/integration/rest-basic/index.spec.ts @@ -55,6 +55,7 @@ test('rest runtime basics', async ({ page, localApp }) => { test('rest editor basics', async ({ page, context, localApp }) => { const editorModel = new ToolpadEditor(page); await editorModel.goto(); + await editorModel.waitForOverlay(); await editorModel.pageEditor.getByRole('button', { name: 'Add query' }).click(); await page.getByRole('button', { name: 'HTTP request' }).click(); From 8dd83af354cb30c2384b2868f545d61eaf7e38cd Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:13:09 +0200 Subject: [PATCH 04/35] Update index.spec.ts --- test/integration/rest-basic/index.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/integration/rest-basic/index.spec.ts b/test/integration/rest-basic/index.spec.ts index 26224d6404a..fceaac68f0d 100644 --- a/test/integration/rest-basic/index.spec.ts +++ b/test/integration/rest-basic/index.spec.ts @@ -55,7 +55,6 @@ test('rest runtime basics', async ({ page, localApp }) => { test('rest editor basics', async ({ page, context, localApp }) => { const editorModel = new ToolpadEditor(page); await editorModel.goto(); - await editorModel.waitForOverlay(); await editorModel.pageEditor.getByRole('button', { name: 'Add query' }).click(); await page.getByRole('button', { name: 'HTTP request' }).click(); From 278f12901aebd419a820e21b7c46dab11652cff5 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:19:24 +0200 Subject: [PATCH 05/35] Update config.yml --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d562c75255..401a2fd16ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,11 @@ orbs: defaults: &defaults working_directory: /tmp/mui-toolpad resource_class: medium + parameters: + browsers: + type: boolean + default: true + description: 'Set to true if you intend to use any browser (e.g. with playwright).' docker: - image: cimg/node:16.14.2 # CircleCI has disabled the cache across forks for security reasons. @@ -85,7 +90,8 @@ jobs: <<: *defaults steps: - checkout - - install_js + - install_js: + browsers: << parameters.browsers >> - run: name: Should not have any git not staged command: git add -A && git diff --exit-code --staged From acd32e02ce8eb02eff7cbf83b670e8856f444b64 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:24:43 +0200 Subject: [PATCH 06/35] Update config.yml --- .circleci/config.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 401a2fd16ff..8ce0192a76f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,11 +5,6 @@ orbs: defaults: &defaults working_directory: /tmp/mui-toolpad resource_class: medium - parameters: - browsers: - type: boolean - default: true - description: 'Set to true if you intend to use any browser (e.g. with playwright).' docker: - image: cimg/node:16.14.2 # CircleCI has disabled the cache across forks for security reasons. @@ -90,8 +85,7 @@ jobs: <<: *defaults steps: - checkout - - install_js: - browsers: << parameters.browsers >> + - install_js - run: name: Should not have any git not staged command: git add -A && git diff --exit-code --staged @@ -213,4 +207,3 @@ workflows: - test_windows: requires: - checkout - browsers: true From 0f7917f038af1542f5cb359ca344d4d72de99971 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:27:47 +0200 Subject: [PATCH 07/35] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ce0192a76f..b8eba51c979 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,7 @@ version: 2.1 orbs: aws-s3: circleci/aws-s3@3.1.1 + win: circleci/windows@5.0 # The Windows orb gives you everything you need to start using the Windows executor. defaults: &defaults working_directory: /tmp/mui-toolpad From 35a33065e1289ed6d950cf1ae3787513e626a53f Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:35:09 +0200 Subject: [PATCH 08/35] Update config.yml --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8eba51c979..de6298fe367 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,6 +145,9 @@ jobs: TOOLPAD_TEST_RETRIES: 1 steps: + - run: + name: 'Install Node.js' + command: nvm install 16 && nvm use 16 - checkout - install_js - run: From 00ea6e11c7b12733fb624105198ed8815abbbf37 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:46:19 +0200 Subject: [PATCH 09/35] correct job --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index de6298fe367..03f7a0ad99d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,9 +145,6 @@ jobs: TOOLPAD_TEST_RETRIES: 1 steps: - - run: - name: 'Install Node.js' - command: nvm install 16 && nvm use 16 - checkout - install_js - run: @@ -178,6 +175,9 @@ jobs: TOOLPAD_TEST_RETRIES: 1 steps: + - run: + name: 'Install Node.js' + command: nvm install 16 && nvm use 16 - checkout - install_js - run: From 13098eb2c30f4d7fb02b6d0175f0ee3f860b4b20 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 13:39:17 +0200 Subject: [PATCH 10/35] Update config.yml --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 03f7a0ad99d..83712dffd81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -177,7 +177,9 @@ jobs: steps: - run: name: 'Install Node.js' - command: nvm install 16 && nvm use 16 + command: | + nvm install 16 + nvm use 16 - checkout - install_js - run: From 24389db6af8f4a063bc0d192bacc6b904c7fe9f8 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:44:28 +0200 Subject: [PATCH 11/35] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83712dffd81..3db3aa79f02 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -178,8 +178,8 @@ jobs: - run: name: 'Install Node.js' command: | - nvm install 16 - nvm use 16 + nvm install 16.14.2 + nvm use 16.14.2 - checkout - install_js - run: From 09f2eb6b434fd7de118c80f4f553c8610b52ae2f Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:45:06 +0200 Subject: [PATCH 12/35] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3db3aa79f02..64a0dab3fc2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,5 +211,5 @@ workflows: requires: - checkout - test_windows: - requires: - - checkout + # requires: + # - checkout From fce5ea0c60007aa5dda228a25652c4fcaa682573 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:45:25 +0200 Subject: [PATCH 13/35] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64a0dab3fc2..3db3aa79f02 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,5 +211,5 @@ workflows: requires: - checkout - test_windows: - # requires: - # - checkout + requires: + - checkout From a79ef6416a2bc56e8e07aea56a05e05416755755 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:17:58 +0200 Subject: [PATCH 14/35] add yarn --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3db3aa79f02..34225805457 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -180,6 +180,7 @@ jobs: command: | nvm install 16.14.2 nvm use 16.14.2 + npm -g install yarn - checkout - install_js - run: From d390f87eeb5047ddf61913f2ff3bb02e941cce18 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Mon, 7 Aug 2023 16:37:21 +0200 Subject: [PATCH 15/35] Update localTest.ts --- test/playwright/localTest.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/playwright/localTest.ts b/test/playwright/localTest.ts index 000bd647ba9..976d1e5e3dd 100644 --- a/test/playwright/localTest.ts +++ b/test/playwright/localTest.ts @@ -11,6 +11,8 @@ import getPort from 'get-port'; import { PageScreenshotOptions, test as base } from './test'; import { waitForMatch } from '../utils/streams'; +const CLI_CMD = path.resolve(__dirname, '../../packages/toolpad-app/cli.js'); + const PROJECT_ROOT = path.resolve(__dirname, '../../'); // https://github.com/mui/material-ui/blob/bc35128302b5bd61fa35f89d371aeed91e6a5748/scripts/pushArgos.mjs#L7 @@ -78,7 +80,7 @@ export async function withApp( if (cmd === 'start') { const buildArgs = ['build']; - const child = childProcess.spawn('toolpad', buildArgs, { + const child = childProcess.spawn(CLI_CMD, buildArgs, { cwd: projectDir, stdio: 'pipe', shell: !process.env.CI, @@ -100,7 +102,7 @@ export async function withApp( } } - const child = childProcess.spawn('toolpad', args, { + const child = childProcess.spawn(CLI_CMD, args, { cwd: projectDir, stdio: 'pipe', shell: !process.env.CI, From 75db2eccd0e619dc3524a4f81d3083f3e3e8c368 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 8 Aug 2023 11:20:53 +0200 Subject: [PATCH 16/35] Update localTest.ts --- test/playwright/localTest.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/playwright/localTest.ts b/test/playwright/localTest.ts index 976d1e5e3dd..2625c2cbb72 100644 --- a/test/playwright/localTest.ts +++ b/test/playwright/localTest.ts @@ -69,7 +69,7 @@ export async function withApp( await setup({ dir: projectDir }); } - const args: string[] = [cmd]; + const args: string[] = [CLI_CMD, cmd]; if (options.toolpadDev) { args.push('--dev'); } @@ -78,9 +78,9 @@ export async function withApp( args.push('--port', String(await getPort())); if (cmd === 'start') { - const buildArgs = ['build']; + const buildArgs = [CLI_CMD, 'build']; - const child = childProcess.spawn(CLI_CMD, buildArgs, { + const child = childProcess.spawn('node', buildArgs, { cwd: projectDir, stdio: 'pipe', shell: !process.env.CI, @@ -102,7 +102,7 @@ export async function withApp( } } - const child = childProcess.spawn(CLI_CMD, args, { + const child = childProcess.spawn('node', args, { cwd: projectDir, stdio: 'pipe', shell: !process.env.CI, From 17dc432ca293e2222a31a2d27f2a27b8e260f45c Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 8 Aug 2023 11:52:32 +0200 Subject: [PATCH 17/35] Update config.yml --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34225805457..8cec5e68a39 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,6 +181,10 @@ jobs: nvm install 16.14.2 nvm use 16.14.2 npm -g install yarn + - run: + name: 'Install browsers' + command: | + npx playwright install - checkout - install_js - run: From 0bb2a2b3a1db59204e3d581916d70846b9b890db Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 8 Aug 2023 13:45:38 +0200 Subject: [PATCH 18/35] Update localTest.ts --- test/playwright/localTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/playwright/localTest.ts b/test/playwright/localTest.ts index 2625c2cbb72..9fd303bfc38 100644 --- a/test/playwright/localTest.ts +++ b/test/playwright/localTest.ts @@ -170,7 +170,7 @@ const test = base.extend< await use(app); }); }, - { scope: 'worker', timeout: 60000 }, + { scope: 'worker', timeout: 120000 }, ], baseURL: async ({ localApp }, use) => { await use(localApp.url); From 67c8704fafd04101ff23724ee0fc164308fd2518 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 8 Aug 2023 18:18:48 +0200 Subject: [PATCH 19/35] Update localTest.ts --- test/playwright/localTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/playwright/localTest.ts b/test/playwright/localTest.ts index 9fd303bfc38..c87a6f5a10c 100644 --- a/test/playwright/localTest.ts +++ b/test/playwright/localTest.ts @@ -139,7 +139,7 @@ export async function withApp( child.kill(); } } finally { - await fs.rm(tmpTestDir, { recursive: true, maxRetries: 3, retryDelay: 1000 }); + await fs.rm(tmpTestDir, { recursive: true }); } } From 9413d5f12c4c63b5b5b92a3a01a1253798dd66af Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:07:01 +0200 Subject: [PATCH 20/35] Update localTest.ts --- test/playwright/localTest.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/playwright/localTest.ts b/test/playwright/localTest.ts index c87a6f5a10c..3715f547a59 100644 --- a/test/playwright/localTest.ts +++ b/test/playwright/localTest.ts @@ -190,15 +190,15 @@ const test = base.extend< async ({ localApp }, use, testInfo) => { await use(null); - if (testInfo.status !== 'passed' && testInfo.status !== 'skipped') { - await fs.mkdir(testInfo.outputDir, { recursive: true }); - const output = createWriteStream(path.resolve(testInfo.outputDir, './projectSnapshot.zip')); - const archive = archiver.create('zip'); - archive.directory(localApp.dir, '/project'); - archive.finalize(); - - await pipeline(archive, output); - } + // if (testInfo.status !== 'passed' && testInfo.status !== 'skipped') { + await fs.mkdir(testInfo.outputDir, { recursive: true }); + const output = createWriteStream(path.resolve(testInfo.outputDir, './projectSnapshot.zip')); + const archive = archiver.create('zip'); + archive.directory(localApp.dir, '/project'); + archive.finalize(); + + await pipeline(archive, output); + // } }, { scope: 'test', auto: true }, ], From 4cd8309de76b9e9c43a9d96196ccc548cac5f9ca Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:13:24 +0200 Subject: [PATCH 21/35] github ci --- .github/workflows/ci.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000000..34d6726ab23 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,34 @@ +name: CI + +on: + push: + branches-ignore: + # Renovate branches are always Pull Requests. + # We don't need to run CI twice (push+pull_request) + - 'renovate/**' + pull_request: + paths-ignore: + # should sync with ci-check.yml as a workaround to bypass github checks + - 'docs/**' + - 'examples/**' + +permissions: {} + +jobs: + test-dev: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-latest, windows-latest, ubuntu-latest] + steps: + - run: echo "${{ github.actor }}" + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - name: Use Node.js 18.x + uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 + with: + node-version: 18 + cache: 'yarn' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies + - run: yarn install + - run: yarn release:build + - run: npx playwright install + - run: yarn test:integration --grep backend-basic --project chromium From 6d093aa50eb6dbb874c7706ea04d00029da88658 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:31:36 +0200 Subject: [PATCH 22/35] Update localTest.ts --- test/playwright/localTest.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/playwright/localTest.ts b/test/playwright/localTest.ts index 3715f547a59..9fd303bfc38 100644 --- a/test/playwright/localTest.ts +++ b/test/playwright/localTest.ts @@ -139,7 +139,7 @@ export async function withApp( child.kill(); } } finally { - await fs.rm(tmpTestDir, { recursive: true }); + await fs.rm(tmpTestDir, { recursive: true, maxRetries: 3, retryDelay: 1000 }); } } @@ -190,15 +190,15 @@ const test = base.extend< async ({ localApp }, use, testInfo) => { await use(null); - // if (testInfo.status !== 'passed' && testInfo.status !== 'skipped') { - await fs.mkdir(testInfo.outputDir, { recursive: true }); - const output = createWriteStream(path.resolve(testInfo.outputDir, './projectSnapshot.zip')); - const archive = archiver.create('zip'); - archive.directory(localApp.dir, '/project'); - archive.finalize(); + if (testInfo.status !== 'passed' && testInfo.status !== 'skipped') { + await fs.mkdir(testInfo.outputDir, { recursive: true }); + const output = createWriteStream(path.resolve(testInfo.outputDir, './projectSnapshot.zip')); + const archive = archiver.create('zip'); + archive.directory(localApp.dir, '/project'); + archive.finalize(); - await pipeline(archive, output); - // } + await pipeline(archive, output); + } }, { scope: 'test', auto: true }, ], From 0559439e22553a80822fb0169b67a3738bdb14e4 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:32:33 +0200 Subject: [PATCH 23/35] Update ci.yml --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34d6726ab23..ed4a4f3b910 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,3 +32,8 @@ jobs: - run: yarn release:build - run: npx playwright install - run: yarn test:integration --grep backend-basic --project chromium + + - uses: actions/upload-artifact@v3 + with: + name: test-results + path: test-results From 8627ab2002c38022e30f5372512a1c82477dd632 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:45:12 +0200 Subject: [PATCH 24/35] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed4a4f3b910..1157e23a087 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: - run: yarn test:integration --grep backend-basic --project chromium - uses: actions/upload-artifact@v3 + if: always() with: name: test-results path: test-results From 33149e6022e7dbaf9a5fff5d7aee8b2f362288dd Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:53:50 +0200 Subject: [PATCH 25/35] name test results --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1157e23a087..bf30bd7dcbb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,5 +36,5 @@ jobs: - uses: actions/upload-artifact@v3 if: always() with: - name: test-results + name: ${{ matrix.os }}-test-results path: test-results From d7ec248b77ecdd4f9bc0144e6eb96d2620df5397 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:55:57 +0200 Subject: [PATCH 26/35] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf30bd7dcbb..9d064d290a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,4 +37,4 @@ jobs: if: always() with: name: ${{ matrix.os }}-test-results - path: test-results + path: test-results/* From 4b2e8577aa7647fbf01ab74a263f4bafdabe2852 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:09:12 +0200 Subject: [PATCH 27/35] Update ci.yml --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d064d290a0..fe47a2e4cc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,11 @@ jobs: - run: yarn install - run: yarn release:build - run: npx playwright install - - run: yarn test:integration --grep backend-basic --project chromium + + - name: Run tests + run: yarn test:integration --grep backend-basic --project chromium + env: + TOOLPAD_TEST_RETRIES: 1 - uses: actions/upload-artifact@v3 if: always() From 534bf0b3c34370a4bbf1cac1d1275a2857cddbf7 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:31:56 +0200 Subject: [PATCH 28/35] Update EnvManager.ts --- packages/toolpad-app/src/server/EnvManager.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/toolpad-app/src/server/EnvManager.ts b/packages/toolpad-app/src/server/EnvManager.ts index 6059c8c3eab..c26c3520d2b 100644 --- a/packages/toolpad-app/src/server/EnvManager.ts +++ b/packages/toolpad-app/src/server/EnvManager.ts @@ -79,6 +79,7 @@ export default class EnvManager { } const envFileWatcher = chokidar.watch([this.getEnvFilePath()], { + usePolling: true, ignoreInitial: true, }); From 9272049ded1c3135e2b6d8023cbbac584a8a3b74 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Wed, 9 Aug 2023 12:57:46 +0200 Subject: [PATCH 29/35] trigger --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe47a2e4cc4..49ca9b1a5ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - run: yarn release:build - run: npx playwright install - - name: Run tests + - name: Run smoke test run: yarn test:integration --grep backend-basic --project chromium env: TOOLPAD_TEST_RETRIES: 1 From f7d8d78cd4c757e61f64c7cf76c80813f82307b1 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:11:22 +0200 Subject: [PATCH 30/35] revert cci --- .circleci/config.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b197ffab5ce..5b4f06bcea8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,6 @@ version: 2.1 orbs: aws-s3: circleci/aws-s3@4.0.0 - win: circleci/windows@5.0 # The Windows orb gives you everything you need to start using the Windows executor. defaults: &defaults working_directory: /tmp/mui-toolpad @@ -168,37 +167,6 @@ jobs: path: test-results destination: playwright-test-results - test_windows: - executor: win/default - environment: - NODE_ENV: test - TOOLPAD_TEST_RETRIES: 1 - - steps: - - run: - name: 'Install Node.js' - command: | - nvm install 16.14.2 - nvm use 16.14.2 - npm -g install yarn - - run: - name: 'Install browsers' - command: | - npx playwright install - - checkout - - install_js - - run: - name: 'Build packages' - command: yarn release:build - - save_cache: - name: Save Next.js cache - key: v0-next-{{ checksum "yarn.lock" }} - paths: - - packages/toolpad-app/.next/cache - - run: - name: Tests real browser - command: yarn test:integration --grep backend-basic --project chromium - workflows: pipeline: jobs: @@ -215,6 +183,3 @@ workflows: - test_unit: requires: - checkout - - test_windows: - requires: - - checkout From 92ab5daf9b0363369c09f31841f8e39b5642e54d Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Thu, 14 Sep 2023 18:06:30 +0200 Subject: [PATCH 31/35] Update ci.yml --- .github/workflows/ci.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49ca9b1a5ac..753e73f0691 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,13 +2,15 @@ name: CI on: push: - branches-ignore: - # Renovate branches are always Pull Requests. - # We don't need to run CI twice (push+pull_request) - - 'renovate/**' + branches: + - master + paths-ignore: + - 'docs/**' + - 'examples/**' pull_request: + branches: + - master paths-ignore: - # should sync with ci-check.yml as a workaround to bypass github checks - 'docs/**' - 'examples/**' @@ -16,6 +18,7 @@ permissions: {} jobs: test-dev: + if: ${{ github.event.ref == 'refs/heads/master'|| contains(github.event.pull_request.labels.*.name, 'bug') }} runs-on: ${{ matrix.os }} strategy: matrix: From 163020e6e034e8728635d279183df0b865a9dd84 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Thu, 14 Sep 2023 18:10:53 +0200 Subject: [PATCH 32/35] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 753e73f0691..a7e36507f28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ permissions: {} jobs: test-dev: - if: ${{ github.event.ref == 'refs/heads/master'|| contains(github.event.pull_request.labels.*.name, 'bug') }} + if: ${{ github.event.ref == 'refs/heads/master'|| contains(github.event.pull_request.labels.*.name, 'OS testing') }} runs-on: ${{ matrix.os }} strategy: matrix: From cfa26b49c83198470edf48ec6e7fac06b8c0953a Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 26 Sep 2023 16:45:18 +0200 Subject: [PATCH 33/35] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7e36507f28..9af2c3aa335 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ permissions: {} jobs: test-dev: - if: ${{ github.event.ref == 'refs/heads/master'|| contains(github.event.pull_request.labels.*.name, 'OS testing') }} + if: ${{ github.event.ref == 'refs/heads/master'|| contains(github.event.pull_request.labels.*.name, 'Full test') }} runs-on: ${{ matrix.os }} strategy: matrix: From e01f3c3fcccc6f793fd21ab29664ce6e02939ca0 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 26 Sep 2023 16:50:16 +0200 Subject: [PATCH 34/35] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9af2c3aa335..3a548210cb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ permissions: {} jobs: test-dev: - if: ${{ github.event.ref == 'refs/heads/master'|| contains(github.event.pull_request.labels.*.name, 'Full test') }} + if: ${{ !github.event.pull_request || contains(github.event.pull_request.labels.*.name, 'Full test') }} runs-on: ${{ matrix.os }} strategy: matrix: From fc0cea82e373c401eb1c3e58d9e6b1d210bb5fad Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Tue, 26 Sep 2023 16:52:37 +0200 Subject: [PATCH 35/35] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a548210cb7..b37d4375aeb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ permissions: {} jobs: test-dev: - if: ${{ !github.event.pull_request || contains(github.event.pull_request.labels.*.name, 'Full test') }} + if: ${{ !github.event.pull_request || contains(github.event.pull_request.labels.*.name, 'Full test') || contains(github.event.pull_request.labels.*.name, 'release 🚀') }} runs-on: ${{ matrix.os }} strategy: matrix: