Skip to content

Commit 1be1b71

Browse files
committed
Half the CI time (thnaks @merceyz) and improve the static webapp workflow
1 parent e52ddb0 commit 1be1b71

5 files changed

Lines changed: 27 additions & 29 deletions

File tree

.github/workflows/CI.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,6 @@ jobs:
5555
- name: "Validates that TypeScript plugins work"
5656
run: npm init typescript-playground-plugin playground-my-plugin
5757

58-
lighthouse_danger:
59-
runs-on: ubuntu-latest
60-
needs: test
61-
steps:
62-
- uses: actions/checkout@master
63-
- uses: actions/setup-node@v1
64-
with:
65-
node-version: "13.x"
66-
67-
- name: Get yarn cache directory path
68-
id: yarn-cache-dir-path
69-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
70-
71-
- uses: actions/cache@v1
72-
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
73-
with:
74-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
75-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
76-
restore-keys: |
77-
${{ runner.os }}-yarn-
78-
79-
- run: yarn install
80-
8158
- run: yarn workspace typescriptlang-org run create-lighthouse-json
8259
env:
8360
PR_NUMBER: ${{ github.event.pull_request.number }}

.github/workflows/azure-static-web-apps-nice-meadow-0c9756810.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@ jobs:
1616
name: Build and Deploy Job
1717
steps:
1818
- uses: actions/checkout@v2
19+
- uses: actions/setup-node@v1
20+
with:
21+
node-version: "13.x"
22+
23+
- name: Get yarn cache directory path
24+
id: yarn-cache-dir-path
25+
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
26+
27+
- uses: actions/cache@v1
28+
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
29+
with:
30+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
31+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
32+
restore-keys: |
33+
${{ runner.os }}-yarn-
34+
35+
- run: yarn install
36+
env:
37+
YARN_CHECKSUM_BEHAVIOR: ignore
38+
1939
- run: yarn bootstrap
2040
- run: yarn workspace typescriptlang-org build
2141

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"private": true,
3+
"name": "root",
34
"workspaces": [
45
"packages/create-typescript-playground-plugin",
56
"packages/typescript-vfs",
@@ -41,10 +42,10 @@
4142
]
4243
},
4344
"scripts": {
44-
"bootstrap": "yarn workspaces foreach -v -a run bootstrap && BOOTSTRAPPING=true yarn workspaces foreach -v -a run build",
45+
"bootstrap": "yarn workspaces foreach -v -a --exclude root run bootstrap && BOOTSTRAPPING=true yarn workspaces foreach -v -a --exclude root run build",
4546
"start": "concurrently -p \"[{name}]\" -n \"BUILD,SITE\" -c \"bgBlue.bold,bgMagenta.bold\" \"node watcher.js\" \"yarn workspace typescriptlang-org start\" --kill-others",
4647
"start-twoslash": "concurrently -p \"[{name}]\" -n \"BUILD,SITE\" -c \"bgBlue.bold,bgMagenta.bold\" \"node watcher.js\" \"yarn workspace typescriptlang-org start-twoslash\" --kill-others",
47-
"build": "yarn workspaces foreach -v -a run build",
48+
"build": "yarn workspaces foreach -v -a --exclude root run build",
4849
"build-site": "yarn workspace typescriptlang-org build",
4950
"compile": "yarn workspace typescriptlang-org tsc",
5051
"update-snapshots": "yarn workspace typescriptlang-org update-snapshots",

packages/typescriptlang-org/src/lib/documentationNavigation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export function getDocumentationNavForLanguage(
214214
title: "Triple-Slash Directives",
215215
id: "triple-slash-directives",
216216
permalink: "/docs/handbook/triple-slash-directives.html",
217-
oneline: "How to use triple slash directives in TypeScripit",
217+
oneline: "How to use triple slash directives in TypeScript",
218218
},
219219
{
220220
title: "Type Compatibility",
@@ -846,7 +846,7 @@ export function getDocumentationNavForLanguage(
846846
title: "Triple-Slash Directives",
847847
id: "triple-slash-directives",
848848
permalink: "/docs/handbook/triple-slash-directives.html",
849-
oneline: "How to use triple slash directives in TypeScripit",
849+
oneline: "How to use triple slash directives in TypeScript",
850850
},
851851
{
852852
title: "Type Compatibility",

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22571,9 +22571,9 @@ resolve@^1.17.0:
2257122571
languageName: node
2257222572
linkType: hard
2257322573

22574-
"root-workspace-0b6124@workspace:.":
22574+
"root@workspace:.":
2257522575
version: 0.0.0-use.local
22576-
resolution: "root-workspace-0b6124@workspace:."
22576+
resolution: "root@workspace:."
2257722577
dependencies:
2257822578
"@types/express": ^4.17.6
2257922579
concurrently: ^5.1.0

0 commit comments

Comments
 (0)