Skip to content

Commit 32707d7

Browse files
committed
chore: ci
1 parent 9ea2af8 commit 32707d7

File tree

10 files changed

+34
-28
lines changed

10 files changed

+34
-28
lines changed

.github/workflows/node.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ jobs:
357357
358358
cd packages
359359
yarn install
360-
yarn build
360+
yarn build:single ${{ matrix.gateway-name }}/tsconfig.build.json
361361
yarn run pinst --disable
362362
yarn workspaces focus ${{ matrix.gateway-name }} --production
363363
- name: Set up Docker Buildx
@@ -467,7 +467,7 @@ jobs:
467467
cd packages
468468
yarn config set cacheFolder /home/runner/${{ matrix.package-name }}-cache
469469
yarn install
470-
yarn build
470+
yarn build:single ${{ matrix.package-name }}/tsconfig.build.json
471471
env:
472472
CI: true
473473
- name: Run typecheck and linter
@@ -539,7 +539,7 @@ jobs:
539539
cd packages
540540
yarn config set cacheFolder /home/runner/test-packages-cache
541541
yarn install
542-
yarn build
542+
yarn build:single ${{ matrix.package-name }}/tsconfig.build.json
543543
env:
544544
CI: true
545545
- name: Run tests

meteor/tsconfig-base.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"include": ["client/**/*", "server/**/*", "lib/**/*", "__mocks__/**/*", "tslint-rules/**/*"],
2121
"exclude": ["node_modules", "**/.coverage/**/*"],
2222
"references": [
23-
{ "path": "../shared-lib" },
24-
{ "path": "../blueprints-integration" },
25-
{ "path": "../corelib" },
26-
{ "path": "../meteor-lib" },
27-
{ "path": "../job-worker" }
23+
{ "path": "../shared-lib/tsconfig.build.json" },
24+
{ "path": "../blueprints-integration/tsconfig.build.json" },
25+
{ "path": "../corelib/tsconfig.build.json" },
26+
{ "path": "../meteor-lib/tsconfig.build.json" },
27+
{ "path": "../job-worker/tsconfig.build.json" }
2828
]
2929
}

packages/job-worker/tsconfig.build.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
},
2121
"references": [
2222
//
23-
{ "path": "../shared-lib" },
24-
{ "path": "../blueprints-integration" },
25-
{ "path": "../corelib" }
23+
{ "path": "../shared-lib/tsconfig.build.json" },
24+
{ "path": "../blueprints-integration/tsconfig.build.json" },
25+
{ "path": "../corelib/tsconfig.build.json" }
2626
]
2727
}

packages/live-status-gateway/tsconfig.build.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"esModuleInterop": true
1717
},
1818
"references": [
19-
{ "path": "../shared-lib" },
20-
{ "path": "../live-status-gateway-api" },
21-
{ "path": "../blueprints-integration" },
22-
{ "path": "../server-core-integration" },
23-
{ "path": "../corelib" }
19+
{ "path": "../shared-lib/tsconfig.build.json" },
20+
{ "path": "../live-status-gateway-api/tsconfig.build.json" },
21+
{ "path": "../blueprints-integration/tsconfig.build.json" },
22+
{ "path": "../server-core-integration/tsconfig.build.json" },
23+
{ "path": "../corelib/tsconfig.build.json" }
2424
]
2525
}

packages/meteor-lib/tsconfig.build.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
},
1919
"references": [
2020
//
21-
{ "path": "../shared-lib" },
22-
{ "path": "../blueprints-integration" },
23-
{ "path": "../corelib" }
21+
{ "path": "../shared-lib/tsconfig.build.json" },
22+
{ "path": "../blueprints-integration/tsconfig.build.json" },
23+
{ "path": "../corelib/tsconfig.build.json" }
2424
]
2525
}

packages/mos-gateway/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY . .
88
RUN corepack enable
99
RUN yarn install --immutable
1010
RUN yarn run pinst --disable
11-
RUN yarn build
11+
RUN yarn build:single mos-gateway/tsconfig.build.json
1212
RUN yarn workspaces focus mos-gateway --production # purge dev-dependencies
1313

1414
# DEPLOY IMAGE

packages/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
},
1717
"scripts": {
1818
"prepare": "lerna run prepare",
19-
"build": "(rimraf */dist */*.tsbuildinfo || true) && run build:prepare && run build:main",
20-
"build:prepare": "lerna run build:prepare",
19+
"build": "run build:prepare && run build:main",
20+
"build:prepare": "(rimraf */dist */*.tsbuildinfo || true) && lerna run build:prepare",
2121
"build:main": "tsc --build tsconfig.build.json",
2222
"build:all": "run build && lerna run build --scope @sofie-automation/openapi",
2323
"build:try": "run build || true",
24+
"build:single": "run build:prepare && tsc --build",
2425
"watch": "run build:main --watch",
2526
"stage-versions": "git add -u \"*/package.json\" \"*/CHANGELOG.md\" lerna.json yarn.lock",
2627
"set-version": "lerna version --exact --no-changelog --no-git-tag-version --no-push --yes",

packages/playout-gateway/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY . .
88
RUN corepack enable
99
RUN yarn install --immutable
1010
RUN yarn run pinst --disable
11-
RUN yarn build
11+
RUN yarn build:single playout-gateway/tsconfig.build.json
1212
RUN yarn workspaces focus playout-gateway --production # purge dev-dependencies
1313

1414
# DEPLOY IMAGE

packages/playout-gateway/tsconfig.build.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@
1212
// TSR throws some typings issues
1313
"skipLibCheck": true,
1414
"resolveJsonModule": true
15-
}
15+
},
16+
"references": [
17+
//
18+
{ "path": "../shared-lib/tsconfig.build.json" },
19+
{ "path": "../server-core-integration/tsconfig.build.json" }
20+
]
1621
}

packages/webui/tsconfig.app.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
},
3030
"include": ["src"],
3131
"references": [
32-
{ "path": "../shared-lib" },
33-
{ "path": "../meteor-lib" },
34-
{ "path": "../blueprints-integration" },
35-
{ "path": "../corelib" }
32+
{ "path": "../shared-lib/tsconfig.build.json" },
33+
{ "path": "../meteor-lib/tsconfig.build.json" },
34+
{ "path": "../blueprints-integration/tsconfig.build.json" },
35+
{ "path": "../corelib/tsconfig.build.json" }
3636
]
3737
}

0 commit comments

Comments
 (0)