Skip to content

Commit ccfecc0

Browse files
nytaminnytamin
committed
Merge branch 'test/1.50.2'
2 parents 5836f20 + 212f014 commit ccfecc0

File tree

83 files changed

+1468
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1468
-249
lines changed

‎.github/workflows/build-windows.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- master
88
- 'release**'
9+
- 'test**'
910
tags:
1011
- 'v**'
1112

@@ -26,6 +27,11 @@ jobs:
2627
- name: Enable Corepack
2728
run: corepack enable
2829

30+
- name: Prepare Environment
31+
run: yarn
32+
env:
33+
CI: true
34+
2935
- name: Run build
3036
env:
3137
CI: true

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ ffmpeg.exe
3939
ffprobe.exe
4040
apps/single-app/app/expectedPackages.json_smartbull
4141
.ffmpeg/
42+
signtool.exe

‎CHANGELOG.md

+42
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,48 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.50.2-alpha.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.2...v1.50.2-alpha.3) (2024-03-25)
7+
8+
**Note:** Version bump only for package package-manager-monorepo
9+
10+
11+
12+
13+
14+
## [1.50.2-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.1...v1.50.2-alpha.2) (2024-03-25)
15+
16+
**Note:** Version bump only for package package-manager-monorepo
17+
18+
19+
20+
21+
22+
## [1.50.2-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.0...v1.50.2-alpha.1) (2024-03-25)
23+
24+
25+
### Bug Fixes
26+
27+
* Add option to skip deep scanning of expectations ([32f2c79](https://github.com/nrkno/tv-automation-package-manager/commit/32f2c79c589414837111013b470ef7903626501f))
28+
* ensure initial log levels are set (ie in workers too) ([403efd8](https://github.com/nrkno/tv-automation-package-manager/commit/403efd8c1617f0bbb03c3156ec02de23a04d1035))
29+
* ensure that (robo-) copied files get their modified date updated ([1ad7431](https://github.com/nrkno/tv-automation-package-manager/commit/1ad74318d69ec6ff35dedd44fde1d9ca475dd917))
30+
* filter out potential '--' from argv to get yargs to play nice ([8d29f0c](https://github.com/nrkno/tv-automation-package-manager/commit/8d29f0c03943c63be164339be67c9f1dc0daaa24))
31+
32+
33+
34+
35+
36+
## [1.50.2-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.1...v1.50.2-alpha.0) (2024-02-29)
37+
38+
39+
### Bug Fixes
40+
41+
* fix an issue where workers wheren't scaled up properly when expectations where waiting ([81f354c](https://github.com/nrkno/tv-automation-package-manager/commit/81f354c301e587eba6f80b4f33b7fe3ebe14bf49))
42+
* robocopy should not copy timstamps ([5856e55](https://github.com/nrkno/tv-automation-package-manager/commit/5856e5576c60747427712f6a005244150c7b6956))
43+
44+
45+
46+
47+
648
## [1.50.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0...v1.50.1) (2024-02-22)
749

850
**Note:** Version bump only for package package-manager-monorepo

‎apps/_boilerplate/app/CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,30 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.50.2-alpha.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.2...v1.50.2-alpha.3) (2024-03-25)
7+
8+
**Note:** Version bump only for package @boilerplate/app
9+
10+
11+
12+
13+
14+
## [1.50.2-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.1...v1.50.2-alpha.2) (2024-03-25)
15+
16+
**Note:** Version bump only for package @boilerplate/app
17+
18+
19+
20+
21+
22+
## [1.50.2-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.0...v1.50.2-alpha.1) (2024-03-25)
23+
24+
**Note:** Version bump only for package @boilerplate/app
25+
26+
27+
28+
29+
630
## [1.43.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.1...v1.43.2) (2024-02-19)
731

832
**Note:** Version bump only for package @boilerplate/app

‎apps/_boilerplate/app/package.json

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "@boilerplate/app",
3-
"version": "1.43.2",
4-
"description": "Boilerplace",
3+
"version": "1.50.2-alpha.3",
4+
"description": "Boilerplate",
55
"private": true,
66
"scripts": {
7-
"build": "run -T rimraf dist && yarn build:main",
7+
"build": "yarn rimraf dist && yarn build:main",
88
"build:main": "tsc -p tsconfig.json",
9-
"build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs boilerplate.exe && node ../../../scripts/copy-natives.js win32-x64",
9+
"build-win32": "node ../../../scripts/build-win32.mjs boilerplate.exe && node ../../../scripts/copy-natives.js win32-x64",
1010
"__test": "jest",
1111
"start": "node dist/index.js"
1212
},
1313
"dependencies": {
14-
"@boilerplate/generic": "1.42.0"
14+
"@boilerplate/generic": "1.50.2-alpha.3"
1515
},
1616
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
1717
"engines": {
@@ -24,5 +24,9 @@
2424
"*.{ts,tsx}": [
2525
"eslint"
2626
]
27+
},
28+
"devDependencies": {
29+
"lerna": "^6.6.1",
30+
"rimraf": "^5.0.5"
2731
}
2832
}

‎apps/_boilerplate/packages/generic/CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.50.2-alpha.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.2...v1.50.2-alpha.3) (2024-03-25)
7+
8+
**Note:** Version bump only for package @boilerplate/generic
9+
10+
11+
12+
13+
14+
## [1.50.2-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.0...v1.50.2-alpha.1) (2024-03-25)
15+
16+
**Note:** Version bump only for package @boilerplate/generic
17+
18+
19+
20+
21+
622
# [1.42.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.0-alpha.5...v1.42.0) (2023-05-10)
723

824
**Note:** Version bump only for package @boilerplate/generic

‎apps/_boilerplate/packages/generic/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@boilerplate/generic",
3-
"version": "1.42.0",
3+
"version": "1.50.2-alpha.3",
44
"private": true,
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
77
"scripts": {
8-
"build": "run -T rimraf dist && yarn build:main",
8+
"build": "yarn rimraf dist && yarn build:main",
99
"build:main": "tsc -p tsconfig.json",
1010
"__test": "jest"
1111
},
@@ -20,5 +20,8 @@
2020
"*.{ts,tsx}": [
2121
"eslint"
2222
]
23+
},
24+
"devDependencies": {
25+
"rimraf": "^5.0.5"
2326
}
2427
}

‎apps/appcontainer-node/app/CHANGELOG.md

+32
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,38 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.50.2-alpha.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.2...v1.50.2-alpha.3) (2024-03-25)
7+
8+
**Note:** Version bump only for package @appcontainer-node/app
9+
10+
11+
12+
13+
14+
## [1.50.2-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.1...v1.50.2-alpha.2) (2024-03-25)
15+
16+
**Note:** Version bump only for package @appcontainer-node/app
17+
18+
19+
20+
21+
22+
## [1.50.2-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.0...v1.50.2-alpha.1) (2024-03-25)
23+
24+
**Note:** Version bump only for package @appcontainer-node/app
25+
26+
27+
28+
29+
30+
## [1.50.2-alpha.0](https://github.com/nrkno/sofie-package-manager/compare/v1.50.1...v1.50.2-alpha.0) (2024-02-29)
31+
32+
**Note:** Version bump only for package @appcontainer-node/app
33+
34+
35+
36+
37+
638
# [1.50.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0-alpha.10...v1.50.0) (2024-02-19)
739

840
**Note:** Version bump only for package @appcontainer-node/app

‎apps/appcontainer-node/app/package.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "@appcontainer-node/app",
3-
"version": "1.50.0",
3+
"version": "1.50.2-alpha.3",
44
"description": "AppContainer-Node.js",
55
"private": true,
66
"scripts": {
7-
"build": "run -T rimraf dist && yarn build:main",
7+
"build": "yarn rimraf dist && yarn build:main",
88
"build:main": "tsc -p tsconfig.json",
9-
"build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs appContainer-node.exe && node ../../../scripts/copy-natives.js win32-x64",
9+
"build-win32": "node ../../../scripts/build-win32.mjs appContainer-node.exe && node ../../../scripts/copy-natives.js win32-x64",
1010
"__test": "jest",
1111
"start": "node dist/index.js"
1212
},
1313
"dependencies": {
14-
"@appcontainer-node/generic": "1.50.0"
14+
"@appcontainer-node/generic": "1.50.2-alpha.3"
1515
},
1616
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
1717
"engines": {
@@ -24,5 +24,9 @@
2424
"*.{ts,tsx}": [
2525
"eslint"
2626
]
27+
},
28+
"devDependencies": {
29+
"lerna": "^6.6.1",
30+
"rimraf": "^5.0.5"
2731
}
2832
}

‎apps/appcontainer-node/packages/generic/CHANGELOG.md

+35
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,41 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.50.2-alpha.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.2...v1.50.2-alpha.3) (2024-03-25)
7+
8+
**Note:** Version bump only for package @appcontainer-node/generic
9+
10+
11+
12+
13+
14+
## [1.50.2-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.1...v1.50.2-alpha.2) (2024-03-25)
15+
16+
**Note:** Version bump only for package @appcontainer-node/generic
17+
18+
19+
20+
21+
22+
## [1.50.2-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.0...v1.50.2-alpha.1) (2024-03-25)
23+
24+
25+
### Bug Fixes
26+
27+
* ensure initial log levels are set (ie in workers too) ([403efd8](https://github.com/nrkno/tv-automation-package-manager/commit/403efd8c1617f0bbb03c3156ec02de23a04d1035))
28+
29+
30+
31+
32+
33+
## [1.50.2-alpha.0](https://github.com/nrkno/sofie-package-manager/compare/v1.50.1...v1.50.2-alpha.0) (2024-02-29)
34+
35+
**Note:** Version bump only for package @appcontainer-node/generic
36+
37+
38+
39+
40+
641
# [1.50.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0-alpha.10...v1.50.0) (2024-02-19)
742

843
**Note:** Version bump only for package @appcontainer-node/generic

‎apps/appcontainer-node/packages/generic/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{
22
"name": "@appcontainer-node/generic",
3-
"version": "1.50.0",
3+
"version": "1.50.2-alpha.3",
44
"private": true,
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
77
"scripts": {
8-
"build": "run -T rimraf dist && yarn build:main",
8+
"build": "yarn rimraf dist && yarn build:main",
99
"build:main": "tsc -p tsconfig.json",
1010
"__test": "jest"
1111
},
1212
"peerDependencies": {
1313
"@sofie-automation/shared-lib": "*"
1414
},
1515
"dependencies": {
16-
"@sofie-package-manager/api": "1.50.0",
17-
"@sofie-package-manager/worker": "1.50.0",
16+
"@sofie-package-manager/api": "1.50.2-alpha.3",
17+
"@sofie-package-manager/worker": "1.50.2-alpha.3",
1818
"underscore": "^1.12.0"
1919
},
2020
"devDependencies": {
21-
"@types/underscore": "^1.10.24"
21+
"@types/underscore": "^1.10.24",
22+
"rimraf": "^5.0.5"
2223
},
2324
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
2425
"engines": {

‎apps/appcontainer-node/packages/generic/src/appContainer.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
DataId,
3535
LockId,
3636
protectString,
37+
getLogLevel,
3738
} from '@sofie-package-manager/api'
3839

3940
import { WorkforceAPI } from './workforceApi'
@@ -275,6 +276,9 @@ export class AppContainer {
275276
private async setupAvailableApps() {
276277
const getWorkerArgs = (appId: AppId): string[] => {
277278
return [
279+
// Set initial loglevel to be same as appContainer:
280+
`--logLevel=${getLogLevel()}`,
281+
278282
`--workerId=${appId}`,
279283
`--workforceURL=${this.config.appContainer.workforceURL}`,
280284
`--appContainerURL=${'ws://127.0.0.1:' + this.websocketServer?.port}`,
@@ -354,7 +358,7 @@ export class AppContainer {
354358
// kill child processes
355359
}
356360
async setLogLevel(logLevel: LogLevel): Promise<void> {
357-
this.logger.info(`Seting log level to "${logLevel}"`)
361+
this.logger.info(`Setting log level to "${logLevel}"`)
358362
setLogLevel(logLevel)
359363
}
360364
async _debugKill(): Promise<void> {

‎apps/http-server/app/CHANGELOG.md

+32
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,38 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.50.2-alpha.3](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.2...v1.50.2-alpha.3) (2024-03-25)
7+
8+
**Note:** Version bump only for package @http-server/app
9+
10+
11+
12+
13+
14+
## [1.50.2-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.1...v1.50.2-alpha.2) (2024-03-25)
15+
16+
**Note:** Version bump only for package @http-server/app
17+
18+
19+
20+
21+
22+
## [1.50.2-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.2-alpha.0...v1.50.2-alpha.1) (2024-03-25)
23+
24+
**Note:** Version bump only for package @http-server/app
25+
26+
27+
28+
29+
30+
## [1.50.2-alpha.0](https://github.com/nrkno/sofie-package-manager/compare/v1.50.1...v1.50.2-alpha.0) (2024-02-29)
31+
32+
**Note:** Version bump only for package @http-server/app
33+
34+
35+
36+
37+
638
# [1.50.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0-alpha.10...v1.50.0) (2024-02-19)
739

840
**Note:** Version bump only for package @http-server/app

0 commit comments

Comments
 (0)