Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.50 (Sofie Release 50 compatible) #103

Merged
merged 85 commits into from
Feb 19, 2024
Merged

1.50 (Sofie Release 50 compatible) #103

merged 85 commits into from
Feb 19, 2024

Conversation

nytamin
Copy link
Contributor

@nytamin nytamin commented Sep 27, 2023

No description provided.

nytamin and others added 30 commits February 17, 2023 13:07
…velop

# Conflicts:
#	apps/package-manager/packages/generic/src/configManifest.ts
#	package.json
#	yarn.lock
This version is compatible with Sofie Core release50
…illed-check-fails' into fix/moreLeniantTimeouts
fix: don't update the package status if a fulfilled status check fails with an error
nytamin and others added 29 commits October 19, 2023 10:53
# Conflicts:
#	yarn.lock
# Conflicts:
#	CHANGELOG.md
#	apps/appcontainer-node/app/CHANGELOG.md
#	apps/appcontainer-node/app/package.json
#	apps/appcontainer-node/packages/generic/CHANGELOG.md
#	apps/appcontainer-node/packages/generic/package.json
#	apps/http-server/app/CHANGELOG.md
#	apps/http-server/app/package.json
#	apps/http-server/packages/generic/CHANGELOG.md
#	apps/http-server/packages/generic/package.json
#	apps/package-manager/app/CHANGELOG.md
#	apps/package-manager/app/package.json
#	apps/package-manager/packages/generic/CHANGELOG.md
#	apps/package-manager/packages/generic/package.json
#	apps/package-manager/packages/generic/src/packageManager.ts
#	apps/quantel-http-transformer-proxy/app/CHANGELOG.md
#	apps/quantel-http-transformer-proxy/app/package.json
#	apps/quantel-http-transformer-proxy/packages/generic/CHANGELOG.md
#	apps/quantel-http-transformer-proxy/packages/generic/package.json
#	apps/single-app/app/CHANGELOG.md
#	apps/single-app/app/package.json
#	apps/worker/app/CHANGELOG.md
#	apps/worker/app/package.json
#	apps/worker/packages/generic/CHANGELOG.md
#	apps/worker/packages/generic/package.json
#	apps/workforce/app/CHANGELOG.md
#	apps/workforce/app/package.json
#	apps/workforce/packages/generic/CHANGELOG.md
#	apps/workforce/packages/generic/package.json
#	lerna.json
#	shared/packages/api/CHANGELOG.md
#	shared/packages/api/package.json
#	shared/packages/expectationManager/CHANGELOG.md
#	shared/packages/expectationManager/package.json
#	shared/packages/worker/CHANGELOG.md
#	shared/packages/worker/package.json
#	shared/packages/worker/src/worker/workers/windowsWorker/expectationHandlers/jsonDataCopy.ts
#	shared/packages/workforce/CHANGELOG.md
#	shared/packages/workforce/package.json
#	tests/internal-tests/CHANGELOG.md
#	tests/internal-tests/package.json
#	tests/internal-tests/src/__tests__/basic.spec.ts
#	tests/internal-tests/src/__tests__/lib/containers.ts
# Conflicts:
#	CHANGELOG.md
#	apps/appcontainer-node/app/CHANGELOG.md
#	apps/appcontainer-node/app/package.json
#	apps/appcontainer-node/packages/generic/CHANGELOG.md
#	apps/appcontainer-node/packages/generic/package.json
#	apps/http-server/app/CHANGELOG.md
#	apps/http-server/app/package.json
#	apps/http-server/packages/generic/CHANGELOG.md
#	apps/http-server/packages/generic/package.json
#	apps/package-manager/app/CHANGELOG.md
#	apps/package-manager/app/package.json
#	apps/package-manager/packages/generic/CHANGELOG.md
#	apps/package-manager/packages/generic/package.json
#	apps/quantel-http-transformer-proxy/app/CHANGELOG.md
#	apps/quantel-http-transformer-proxy/app/package.json
#	apps/quantel-http-transformer-proxy/packages/generic/CHANGELOG.md
#	apps/quantel-http-transformer-proxy/packages/generic/package.json
#	apps/single-app/app/CHANGELOG.md
#	apps/single-app/app/package.json
#	apps/worker/app/CHANGELOG.md
#	apps/worker/app/package.json
#	apps/worker/packages/generic/CHANGELOG.md
#	apps/worker/packages/generic/package.json
#	apps/workforce/app/CHANGELOG.md
#	apps/workforce/app/package.json
#	apps/workforce/packages/generic/CHANGELOG.md
#	apps/workforce/packages/generic/package.json
#	lerna.json
#	shared/packages/api/CHANGELOG.md
#	shared/packages/api/package.json
#	shared/packages/expectationManager/CHANGELOG.md
#	shared/packages/expectationManager/package.json
#	shared/packages/worker/CHANGELOG.md
#	shared/packages/worker/package.json
#	shared/packages/workforce/CHANGELOG.md
#	shared/packages/workforce/package.json
#	tests/internal-tests/CHANGELOG.md
#	tests/internal-tests/package.json
# Conflicts:
#	CHANGELOG.md
#	apps/appcontainer-node/app/CHANGELOG.md
#	apps/appcontainer-node/app/package.json
#	apps/appcontainer-node/packages/generic/CHANGELOG.md
#	apps/appcontainer-node/packages/generic/package.json
#	apps/package-manager/app/CHANGELOG.md
#	apps/package-manager/app/package.json
#	apps/package-manager/packages/generic/CHANGELOG.md
#	apps/package-manager/packages/generic/package.json
#	apps/single-app/app/CHANGELOG.md
#	apps/single-app/app/package.json
#	apps/worker/app/CHANGELOG.md
#	apps/worker/app/package.json
#	apps/worker/packages/generic/CHANGELOG.md
#	apps/worker/packages/generic/package.json
#	lerna.json
#	shared/packages/expectationManager/CHANGELOG.md
#	shared/packages/expectationManager/package.json
#	shared/packages/worker/CHANGELOG.md
#	shared/packages/worker/package.json
#	tests/internal-tests/CHANGELOG.md
#	tests/internal-tests/package.json
# Conflicts:
#	CHANGELOG.md
#	apps/_boilerplate/app/CHANGELOG.md
#	apps/_boilerplate/app/package.json
#	apps/appcontainer-node/app/CHANGELOG.md
#	apps/appcontainer-node/app/package.json
#	apps/appcontainer-node/packages/generic/CHANGELOG.md
#	apps/appcontainer-node/packages/generic/package.json
#	apps/http-server/app/CHANGELOG.md
#	apps/http-server/app/package.json
#	apps/http-server/packages/generic/CHANGELOG.md
#	apps/http-server/packages/generic/package.json
#	apps/package-manager/app/CHANGELOG.md
#	apps/package-manager/app/package.json
#	apps/package-manager/packages/generic/CHANGELOG.md
#	apps/package-manager/packages/generic/package.json
#	apps/quantel-http-transformer-proxy/app/CHANGELOG.md
#	apps/quantel-http-transformer-proxy/app/package.json
#	apps/quantel-http-transformer-proxy/packages/generic/CHANGELOG.md
#	apps/quantel-http-transformer-proxy/packages/generic/package.json
#	apps/single-app/app/CHANGELOG.md
#	apps/single-app/app/package.json
#	apps/worker/app/CHANGELOG.md
#	apps/worker/app/package.json
#	apps/worker/packages/generic/CHANGELOG.md
#	apps/worker/packages/generic/package.json
#	apps/workforce/app/CHANGELOG.md
#	apps/workforce/app/package.json
#	apps/workforce/packages/generic/CHANGELOG.md
#	apps/workforce/packages/generic/package.json
#	lerna.json
#	shared/packages/api/CHANGELOG.md
#	shared/packages/api/package.json
#	shared/packages/expectationManager/CHANGELOG.md
#	shared/packages/expectationManager/package.json
#	shared/packages/worker/CHANGELOG.md
#	shared/packages/worker/package.json
#	shared/packages/worker/src/__tests__/fileShare.spec.ts_
#	shared/packages/workforce/CHANGELOG.md
#	shared/packages/workforce/package.json
#	tests/internal-tests/CHANGELOG.md
#	tests/internal-tests/package.json
#	yarn.lock
@nytamin nytamin merged commit f990b86 into master Feb 19, 2024
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants