Merge branch 'test/1.50.2'

nrkno · Mar 27, 2024 · ccfecc0 · ccfecc0
2 parents 5836f20 + 212f014
commit ccfecc0
Show file tree

Hide file tree

Showing 83 changed files with 1,468 additions and 249 deletions.
diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - 'release**'
+      - 'test**'
     tags:
       - 'v**'
 
@@ -26,6 +27,11 @@ jobs:
       - name: Enable Corepack
         run: corepack enable
 
+      - name: Prepare Environment
+        run: yarn
+        env:
+          CI: true
+
       - name: Run build
         env:
           CI: true

diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,4 @@ ffmpeg.exe
 ffprobe.exe
 apps/single-app/app/expectedPackages.json_smartbull
 .ffmpeg/
+signtool.exe
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
+
+**Note:** Version bump only for package package-manager-monorepo
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package package-manager-monorepo
+
+
+
+
+
+## [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)
+
+
+### Bug Fixes
+
+* Add option to skip deep scanning of expectations ([32f2c79](https://github.com/nrkno/tv-automation-package-manager/commit/32f2c79c589414837111013b470ef7903626501f))
+* ensure initial log levels are set (ie in workers too) ([403efd8](https://github.com/nrkno/tv-automation-package-manager/commit/403efd8c1617f0bbb03c3156ec02de23a04d1035))
+* ensure that (robo-) copied files get their modified date updated ([1ad7431](https://github.com/nrkno/tv-automation-package-manager/commit/1ad74318d69ec6ff35dedd44fde1d9ca475dd917))
+* filter out potential '--' from argv to get yargs to play nice ([8d29f0c](https://github.com/nrkno/tv-automation-package-manager/commit/8d29f0c03943c63be164339be67c9f1dc0daaa24))
+
+
+
+
+
+## [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)
+
+
+### Bug Fixes
+
+* 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))
+* robocopy should not copy timstamps ([5856e55](https://github.com/nrkno/tv-automation-package-manager/commit/5856e5576c60747427712f6a005244150c7b6956))
+
+
+
+
+
 ## [1.50.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0...v1.50.1) (2024-02-22)
 
 **Note:** Version bump only for package package-manager-monorepo

diff --git a/apps/_boilerplate/app/CHANGELOG.md b/apps/_boilerplate/app/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
+
+**Note:** Version bump only for package @boilerplate/app
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @boilerplate/app
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @boilerplate/app
+
+
+
+
+
 ## [1.43.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.1...v1.43.2) (2024-02-19)
 
 **Note:** Version bump only for package @boilerplate/app

diff --git a/apps/_boilerplate/app/package.json b/apps/_boilerplate/app/package.json
@@ -1,17 +1,17 @@
 {
     "name": "@boilerplate/app",
-    "version": "1.43.2",
-    "description": "Boilerplace",
+    "version": "1.50.2-alpha.3",
+    "description": "Boilerplate",
     "private": true,
     "scripts": {
-        "build": "run -T rimraf dist && yarn build:main",
+        "build": "yarn rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
-        "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs boilerplate.exe && node ../../../scripts/copy-natives.js win32-x64",
+        "build-win32": "node ../../../scripts/build-win32.mjs boilerplate.exe && node ../../../scripts/copy-natives.js win32-x64",
         "__test": "jest",
         "start": "node dist/index.js"
     },
     "dependencies": {
-        "@boilerplate/generic": "1.42.0"
+        "@boilerplate/generic": "1.50.2-alpha.3"
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
@@ -24,5 +24,9 @@
         "*.{ts,tsx}": [
             "eslint"
         ]
+    },
+    "devDependencies": {
+        "lerna": "^6.6.1",
+        "rimraf": "^5.0.5"
     }
 }
diff --git a/apps/_boilerplate/packages/generic/CHANGELOG.md b/apps/_boilerplate/packages/generic/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
+
+**Note:** Version bump only for package @boilerplate/generic
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @boilerplate/generic
+
+
+
+
+
 # [1.42.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.0-alpha.5...v1.42.0) (2023-05-10)
 
 **Note:** Version bump only for package @boilerplate/generic

diff --git a/apps/_boilerplate/packages/generic/package.json b/apps/_boilerplate/packages/generic/package.json
@@ -1,11 +1,11 @@
 {
     "name": "@boilerplate/generic",
-    "version": "1.42.0",
+    "version": "1.50.2-alpha.3",
     "private": true,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "run -T rimraf dist && yarn build:main",
+        "build": "yarn rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "__test": "jest"
     },
@@ -20,5 +20,8 @@
         "*.{ts,tsx}": [
             "eslint"
         ]
+    },
+    "devDependencies": {
+        "rimraf": "^5.0.5"
     }
 }
diff --git a/apps/appcontainer-node/app/CHANGELOG.md b/apps/appcontainer-node/app/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
+
+**Note:** Version bump only for package @appcontainer-node/app
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @appcontainer-node/app
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @appcontainer-node/app
+
+
+
+
+
+## [1.50.2-alpha.0](https://github.com/nrkno/sofie-package-manager/compare/v1.50.1...v1.50.2-alpha.0) (2024-02-29)
+
+**Note:** Version bump only for package @appcontainer-node/app
+
+
+
+
+
 # [1.50.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0-alpha.10...v1.50.0) (2024-02-19)
 
 **Note:** Version bump only for package @appcontainer-node/app

diff --git a/apps/appcontainer-node/app/package.json b/apps/appcontainer-node/app/package.json
@@ -1,17 +1,17 @@
 {
     "name": "@appcontainer-node/app",
-    "version": "1.50.0",
+    "version": "1.50.2-alpha.3",
     "description": "AppContainer-Node.js",
     "private": true,
     "scripts": {
-        "build": "run -T rimraf dist && yarn build:main",
+        "build": "yarn rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
-        "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs appContainer-node.exe && node ../../../scripts/copy-natives.js win32-x64",
+        "build-win32": "node ../../../scripts/build-win32.mjs appContainer-node.exe && node ../../../scripts/copy-natives.js win32-x64",
         "__test": "jest",
         "start": "node dist/index.js"
     },
     "dependencies": {
-        "@appcontainer-node/generic": "1.50.0"
+        "@appcontainer-node/generic": "1.50.2-alpha.3"
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
@@ -24,5 +24,9 @@
         "*.{ts,tsx}": [
             "eslint"
         ]
+    },
+    "devDependencies": {
+        "lerna": "^6.6.1",
+        "rimraf": "^5.0.5"
     }
 }
diff --git a/apps/appcontainer-node/packages/generic/CHANGELOG.md b/apps/appcontainer-node/packages/generic/CHANGELOG.md
@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
+
+**Note:** Version bump only for package @appcontainer-node/generic
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @appcontainer-node/generic
+
+
+
+
+
+## [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)
+
+
+### Bug Fixes
+
+* ensure initial log levels are set (ie in workers too) ([403efd8](https://github.com/nrkno/tv-automation-package-manager/commit/403efd8c1617f0bbb03c3156ec02de23a04d1035))
+
+
+
+
+
+## [1.50.2-alpha.0](https://github.com/nrkno/sofie-package-manager/compare/v1.50.1...v1.50.2-alpha.0) (2024-02-29)
+
+**Note:** Version bump only for package @appcontainer-node/generic
+
+
+
+
+
 # [1.50.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0-alpha.10...v1.50.0) (2024-02-19)
 
 **Note:** Version bump only for package @appcontainer-node/generic

diff --git a/apps/appcontainer-node/packages/generic/package.json b/apps/appcontainer-node/packages/generic/package.json
@@ -1,24 +1,25 @@
 {
     "name": "@appcontainer-node/generic",
-    "version": "1.50.0",
+    "version": "1.50.2-alpha.3",
     "private": true,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "run -T rimraf dist && yarn build:main",
+        "build": "yarn rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "__test": "jest"
     },
     "peerDependencies": {
         "@sofie-automation/shared-lib": "*"
     },
     "dependencies": {
-        "@sofie-package-manager/api": "1.50.0",
-        "@sofie-package-manager/worker": "1.50.0",
+        "@sofie-package-manager/api": "1.50.2-alpha.3",
+        "@sofie-package-manager/worker": "1.50.2-alpha.3",
         "underscore": "^1.12.0"
     },
     "devDependencies": {
-        "@types/underscore": "^1.10.24"
+        "@types/underscore": "^1.10.24",
+        "rimraf": "^5.0.5"
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {

diff --git a/apps/appcontainer-node/packages/generic/src/appContainer.ts b/apps/appcontainer-node/packages/generic/src/appContainer.ts
@@ -34,6 +34,7 @@ import {
 	DataId,
 	LockId,
 	protectString,
+	getLogLevel,
 } from '@sofie-package-manager/api'
 
 import { WorkforceAPI } from './workforceApi'
@@ -275,6 +276,9 @@ export class AppContainer {
 	private async setupAvailableApps() {
 		const getWorkerArgs = (appId: AppId): string[] => {
 			return [
+				// Set initial loglevel to be same as appContainer:
+				`--logLevel=${getLogLevel()}`,
+
 				`--workerId=${appId}`,
 				`--workforceURL=${this.config.appContainer.workforceURL}`,
 				`--appContainerURL=${'ws://127.0.0.1:' + this.websocketServer?.port}`,
@@ -354,7 +358,7 @@ export class AppContainer {
 		// kill child processes
 	}
 	async setLogLevel(logLevel: LogLevel): Promise<void> {
-		this.logger.info(`Seting log level to "${logLevel}"`)
+		this.logger.info(`Setting log level to "${logLevel}"`)
 		setLogLevel(logLevel)
 	}
 	async _debugKill(): Promise<void> {

diff --git a/apps/http-server/app/CHANGELOG.md b/apps/http-server/app/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
+
+**Note:** Version bump only for package @http-server/app
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @http-server/app
+
+
+
+
+
+## [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)
+
+**Note:** Version bump only for package @http-server/app
+
+
+
+
+
+## [1.50.2-alpha.0](https://github.com/nrkno/sofie-package-manager/compare/v1.50.1...v1.50.2-alpha.0) (2024-02-29)
+
+**Note:** Version bump only for package @http-server/app
+
+
+
+
+
 # [1.50.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.50.0-alpha.10...v1.50.0) (2024-02-19)
 
 **Note:** Version bump only for package @http-server/app