From 02af058977550b5f533a1fc333bd39a72b94f70d Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Sat, 21 Sep 2019 07:55:30 -0400 Subject: [PATCH 1/5] Remove daily infrastructure --- azure-pipelines.yml | 25 ------------------------- package.json | 3 +-- scripts/runDaily.js | 29 ----------------------------- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 azure-pipelines.yml delete mode 100644 scripts/runDaily.js diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 5a43b39e..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,25 +0,0 @@ -# triggered by schedule at 5am to try make sure it's done after the TS daily build -schedules: -- cron: '0 5 * * *' - displayName: Daily 5am build - branches: - include: - - master - always: true - -pr: none - -pool: - vmImage: 'ubuntu-latest' - -steps: -- bash: | - npm install - npm run run-nightly - displayName: 'Update & Build' - -- bash: | - echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc - npm publish --tag next - - displayName: 'Publish to NPM' diff --git a/package.json b/package.json index 5a002e0a..6bbb4da5 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,7 @@ "compile": "mrmdir ./release && npm run compile-amd && npm run compile-esm", "watch": "tsc -p ./src --watch", "prepublishOnly": "npm run compile && node ./scripts/bundle && mcopy ./src/monaco.d.ts ./release/monaco.d.ts", - "import-typescript": "node ./scripts/importTypescript", - "run-nightly": "node ./scripts/runDaily" + "import-typescript": "node ./scripts/importTypescript" }, "author": "Microsoft Corporation", "license": "MIT", diff --git a/scripts/runDaily.js b/scripts/runDaily.js deleted file mode 100644 index a5fccf27..00000000 --- a/scripts/runDaily.js +++ /dev/null @@ -1,29 +0,0 @@ -// @ts-check -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -const { execSync } = require("child_process"); -const { join } = require("path"); -const { readFileSync, writeFileSync } = require("fs"); - -// Update to the daily build -execSync("npm install --save typescript@next"); - -// Update the dts files -execSync("npm run import-typescript"); - -// Sync the versions -const packagePath = join(__dirname, "../package.json"); -const package = JSON.parse(readFileSync(packagePath, "utf8")); - -const tsPackagePath = join(__dirname, "../node_modules/typescript/package.json"); -const tsPackage = JSON.parse(readFileSync(tsPackagePath, "utf8")); - -// Set the monaco-typescript version to directly match the typescript nightly version -package.version = tsPackage.version; -writeFileSync(packagePath, JSON.stringify(package), "utf8"); - -// Update the dts files -execSync("npm run compile"); From 53be7ba6a0347cc7f3ec2a94c92ee31de0fcbeb3 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Thu, 26 Sep 2019 11:36:31 -0400 Subject: [PATCH 2/5] Let changes to the test file persist --- test/index.html | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/test/index.html b/test/index.html index deb28551..02bbed65 100644 --- a/test/index.html +++ b/test/index.html @@ -33,12 +33,9 @@ - \ No newline at end of file + From 75e4622b1e66d46aeb1f870bffd7513bc6802ee2 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Thu, 26 Sep 2019 07:53:55 -0400 Subject: [PATCH 3/5] Adds a CI to check that the build compiles --- .github/workflows/ci.yml | 14 ++++++++++++++ 1 file changed, 14 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 00000000..6246c6a7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,14 @@ +name: "CI" +on: [pull_request] +jobs: + build: + name: "Builds and Compiles" + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@master + - uses: actions/setup-node@v1 + with: + node-version: '10.x' + - run: npm install + - run: npm run compile From 274cc4a172597bffc902637218a37fa7f81eb2ef Mon Sep 17 00:00:00 2001 From: larshp Date: Tue, 1 Oct 2019 07:52:11 +0200 Subject: [PATCH 4/5] fix typo --- src/languageFeatures.ts | 2 +- src/tsMode.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index 474a8597..367e1e80 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -83,7 +83,7 @@ export abstract class Adapter { // --- diagnostics --- --- -export class DiagnostcsAdapter extends Adapter { +export class DiagnosticsAdapter extends Adapter { private _disposables: IDisposable[] = []; private _listener: { [uri: string]: IDisposable } = Object.create(null); diff --git a/src/tsMode.ts b/src/tsMode.ts index 4647b3dd..5c2f1fd2 100644 --- a/src/tsMode.ts +++ b/src/tsMode.ts @@ -65,7 +65,7 @@ function setupMode(defaults: LanguageServiceDefaultsImpl, modeId: string): (firs monaco.languages.registerDocumentRangeFormattingEditProvider(modeId, new languageFeatures.FormatAdapter(worker)); monaco.languages.registerOnTypeFormattingEditProvider(modeId, new languageFeatures.FormatOnTypeAdapter(worker)); monaco.languages.registerRenameProvider(modeId, new languageFeatures.RenameAdapter(worker)); - new languageFeatures.DiagnostcsAdapter(defaults, modeId, worker); + new languageFeatures.DiagnosticsAdapter(defaults, modeId, worker); return worker; } From f7d75e139cafc379f6a3dcb0b981a281a147efb4 Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Wed, 2 Oct 2019 22:08:59 +0200 Subject: [PATCH 5/5] 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 6246c6a7..d5aa4737 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ jobs: name: "Builds and Compiles" runs-on: ubuntu-latest - steps: + steps: - uses: actions/checkout@master - uses: actions/setup-node@v1 with: