Skip to content

Commit

Permalink
Merge pull request #100 from nrkno/fix/main-not-updated-SOFIE-3067
Browse files Browse the repository at this point in the history
Fix/main not updated sofie 3067
  • Loading branch information
mint-dewit authored Apr 30, 2024
2 parents fb2369a + a155d24 commit ffb8bf6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/publish-prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
COMMIT_DATE=$(date -d @$COMMIT_TIMESTAMP +%Y%m%d-%H%M%S)
GIT_HASH=$(git rev-parse --short HEAD)
PRERELEASE_TAG=nightly-$(echo "${{ github.ref_name }}" | sed -r 's/[^a-z0-9]+/-/gi')
yarn release:bump-prerelease --no-changelog --no-commit-hooks --preid "$PRERELEASE_TAG-$COMMIT_DATE-$GIT_HASH" prerelease --yes
yarn release:bump-prerelease-ci --no-changelog --no-commit-hooks --preid "$PRERELEASE_TAG-$COMMIT_DATE-$GIT_HASH" prerelease --yes
env:
CI: true
- name: Publish to NPM
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"release:set-version": "lerna version --exact --no-changelog --no-push --yes && yarn fix-version",
"release:bump-release": "lerna version --exact --conventional-commits --conventional-graduate --tag-version-prefix='v' --no-push --force-publish='*' && yarn fix-version",
"release:bump-prerelease": "lerna version --exact --conventional-commits --conventional-prerelease --tag-version-prefix='v' --no-push --force-publish='*' && yarn fix-version",
"release:bump-prerelease-ci": "lerna version --exact --conventional-commits --conventional-prerelease --tag-version-prefix='v' --no-push --force-publish='*'",
"fix-version": "node scripts/fix-version.js",
"setup": "lerna bootstrap",
"reset": "node scripts/reset.js",
Expand Down
7 changes: 7 additions & 0 deletions packages/connector/src/MosDevice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1539,6 +1539,13 @@ export class MosDevice implements IMOSDevice {
throw new Error('Buddy server cannot respond because main server is available')
}

if (
reply.mos.roAck &&
reply.mos.roAck.roStatus === 'Main server back on line but not yet updated with most recent data'
) {
throw new Error('Main server back on line but not yet updated with most recent data')
}

if (reply.mos.mosAck && reply.mos.mosAck.status === 'NACK') {
throw new Error(`Error in response: ${reply.mos.mosAck.statusDescription || 'No statusDescription given'}`)
}
Expand Down

0 comments on commit ffb8bf6

Please sign in to comment.