From e0d091f2051725c6fc3c503324599124f4329385 Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Tue, 14 Nov 2023 14:59:37 +0000 Subject: [PATCH] Run CI on this branch --- .github/workflows/ci.yml | 4 ++++ package.json | 2 +- packages/core/__tests__/cli/custom-extensions.test.ts | 5 ++++- yarn.lock | 8 ++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abed4e4db..a63f10321 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: # filtering branches here prevents duplicate builds from pull_request and push branches: - main + - write-and-await-output # always run CI for tags tags: - '*' @@ -126,6 +127,9 @@ jobs: run: yarn add --dev -W typescript@next - name: Build run: yarn build + - uses: lhotari/action-upterm@v1 + with: + limit-access-to-actor: true - name: Run Tests uses: coactions/setup-xvfb@v1 with: diff --git a/package.json b/package.json index eba884cfe..4826e062c 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "eslint": "^8.27.0", "prettier": "^2.1.1", "release-it": "^15.5.0", - "typescript": "~4.8.0" + "typescript": "^5.4.0-dev.20231114" }, "resolutions:notes": { "@types/yargs": "Locking temporarily to avoid an issue with the ESM types in 17.0.14; see DT#63373", diff --git a/packages/core/__tests__/cli/custom-extensions.test.ts b/packages/core/__tests__/cli/custom-extensions.test.ts index 27ccd4f13..815db57d0 100644 --- a/packages/core/__tests__/cli/custom-extensions.test.ts +++ b/packages/core/__tests__/cli/custom-extensions.test.ts @@ -81,7 +81,10 @@ describe('CLI: custom extensions', () => { "Cannot find module './other' or its corresponding type declarations." ); - await watch.writeAndAwaitOutput('other.gjs', 'export const foo = 123;', 'Found 0 errors.'); + await watch.writeAndAwaitOutput('other.gjs', 'export const foo = 123;', 'Found 0 errors.', { + timeout: 45_000, + touchFileTimeout: 20_000, + }); await watch.terminate(); }); diff --git a/yarn.lock b/yarn.lock index 4912405a4..7b07fd21d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14704,10 +14704,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1: resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.1.tgz#02737495d5df6ebf72c07ba0d002e8f4cf5ccfa0" integrity sha512-GQ90TcKpIH4XxYTI2F98yEQYZgjNMOGPpOgdjIBhaLaWji5HPWlRnZ4AeA1hfBxtY7bCGDJsqDDHk/KaHOl5bA== -typescript@~4.8.0: - version "4.8.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" - integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== +typescript@^5.4.0-dev.20231114: + version "5.4.0-dev.20231114" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.0-dev.20231114.tgz#8371de6d968a6da7ce3156997fee9b064d67cdfb" + integrity sha512-z7rH8Vy4KWJyzNUaFt1HMzwYNRUmy2HMN98eufjvqbhmS3WPoQF89/UgonRmYf1vAP/69z0PytuV9hBMHNkaDg== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6"