Merge pull request #182 from tv2/mergeStagingToMaster

Merge staging to master
tv2 · Dec 21, 2022 · 987b3a0 · 987b3a0
2 parents 65a1fa2 + 2637115
commit 987b3a0
Show file tree

Hide file tree

Showing 237 changed files with 3,093 additions and 1,981 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -1,23 +1,71 @@
-name: automerge
+name: Scheduled Automerge Master -> Staging -> Develop
 
 on:
   schedule:
-    - cron: '15 0 * * *' # every night
+    - cron: '0 0 * * 1-5' # At 00:00, Monday through Friday
   workflow_dispatch: # on button click
 
 jobs:
-  merge-staging-to-dev:
+  merge-master-to-staging:
+    name: Merge Master to Staging
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set Git config
         run: |
-          git config --local user.email "${GITHUB_ACTOR}"
-          git config --local user.name "${GITHUB_ACTOR}@users.noreply.github.com"
-      - name: Merge staging to develop
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Actions # Blueprint-Automation"
+      - name: Merge 'master' to 'staging'
+        id: merge
+        continue-on-error: true
+        run: |
+          git fetch --unshallow
+          git checkout staging
+          git pull
+          git merge --no-ff origin/master -m "Automerge 'master' to 'staging'"
+          git push
+      - name: Abort merge
+        if: steps.merge.outcome == 'failure'
+        run: git merge --abort
+      - name: Create Pull Request on merge failure
+        if: steps.merge.outcome == 'failure'
+        uses: repo-sync/pull-request@v2
+        with:
+          source_branch: master
+          destination_branch: staging
+          pr_title: "Automerge Failed: master -> staging"
+          pr_body: Failed to merge 'master' into 'staging'.
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+  merge-staging-to-develop:
+    name: Merge Staging to Develop
+    runs-on: ubuntu-latest
+    needs: merge-master-to-staging
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set Git config
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Actions # Blueprint-Automation"
+      - name: Merge 'staging' to 'develop'
+        id: merge
+        continue-on-error: true
         run: |
           git fetch --unshallow
           git checkout develop
           git pull
-          git merge --no-ff origin/staging -m "Auto-merge staging to develop"
+          git merge --no-ff origin/staging -m "Automerge 'staging' to 'develop'."
           git push
+      - name: Abort merge
+        if: steps.merge.outcome == 'failure'
+        run: git merge --abort
+      - name: Create Pull Request on merge failure
+        if: steps.merge.outcome == 'failure'
+        uses: repo-sync/pull-request@v2
+        with:
+          source_branch: staging
+          destination_branch: develop
+          pr_title: "Automerge Failed: staging -> develop"
+          pr_body: Failed to merge 'staging' into 'develop'.
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -6,6 +6,8 @@ const pkg = require('../package.json')
 const { GetEntrypointsForBundle, BlueprintEntrypoints } = require('../scripts/blueprint-map')
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin')
 
+const BLUEPRINTS_INTEGRATION_PACKAGE = '@sofie-automation/blueprints-integration'
+
 module.exports = env => {
 	if (!env) env = {}
 
@@ -20,15 +22,15 @@ module.exports = env => {
 		versionStr = () => JSON.stringify(pkg.version + '+dev-' + moment().format('YYYYMMDD-HHmm'))
 	}
 
-	let versionIntegration = pkg.dependencies['@tv2media/blueprints-integration']
+	let versionIntegration = pkg.dependencies[BLUEPRINTS_INTEGRATION_PACKAGE]
 
-	if (!versionIntegration) throw Error('@tv2media/blueprints-integration version missing!')
+	if (!versionIntegration) throw Error(`${BLUEPRINTS_INTEGRATION_PACKAGE} version missing!`)
 
 	// versionTSRTypes = versionTSRTypes.replace(/[^\d.]/g, '') || '0.0.0'
 	// versionIntegration = versionIntegration.replace(/[^\d.]/g, '') || '0.0.0'
 
 	versionTSRTypes = '1.3.0'
-	versionIntegration = '42.0.0'
+	versionIntegration = '46.1.0'
 
 	const entrypoints = env.bundle ? GetEntrypointsForBundle(env.bundle) : BlueprintEntrypoints
 

diff --git a/jest.config.js b/jest.config.js
@@ -37,6 +37,7 @@ module.exports = {
 	],
 	moduleDirectories: [
 		"node_modules",
-		"src"
+		"src",
+		"src/types"
 	]
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tv2-sofie-blueprints-inews",
-  "version": "1.7.5",
+  "version": "1.7.8",
   "repository": "https://github.com/olzzon/tv2-sofie-blueprints-inews",
   "license": "MIT",
   "private": true,
@@ -60,7 +60,7 @@
     "webpack-cli": "^3.1.2"
   },
   "dependencies": {
-    "@tv2media/blueprints-integration": "1.42.7",
+    "@sofie-automation/blueprints-integration": "npm:@tv2media/[email protected]",
     "underscore": "^1.12.1"
   },
   "resolutions": {

diff --git a/rundowns/offtubes-reference.json b/rundowns/offtubes-reference.json
@@ -229,6 +229,50 @@
             },
             "parts": []
         },
+        {
+            "externalId": "00000000:00000000:00000099",
+            "name": "VCP OVL",
+            "rank": 2,
+            "payload": {
+                "rundownId": "NYHEDERNE-TEST.SOFIE.OFF-TUBES",
+                "iNewsStory": {
+                    "fields" : {
+                        "pageNumber" : "03",
+                        "title" : "VCP OVL",
+                        "audioTime" : "0",
+                        "totalTime" : "0",
+                        "modifyDate" : "1582890240",
+                        "modifyBy" : "bede",
+                        "ready" : "KLAR",
+                        "runsTime" : "0",
+                        "typecode" : "spx",
+                        "programtitle" : " "
+                    },
+                    "meta" : {
+                        "rate" : "165"
+                    },
+                    "cues" : [
+                        [
+                            "#cg4 pilotdata",
+                            "LgfxWeb/WEB_HEN_FORMEL1_10AUGT12346_JACH/Mosart=L|00:00|S",
+                            "VCPID=2598145",
+                            "ContinueCount=-1",
+                            "LgfxWeb/WEB_HEN_FORMEL1_10AUGT12346_JACH/Mosart=L|00:00|S"
+                        ]
+                    ],
+                    "id" : "00000000:00000000:00000099",
+                    "body" : "\r\n<pi>KAM 1</pi>\r\n<p><a idref=\"0\"></a></p>\r\n",
+                    "fileId" : "00000000:00000000:00000099",
+                    "identifier" : "00000099"
+                },
+                "modified": "2019-10-11T06:38:00.000Z",
+                "externalId": "00000000:00000000:00000099",
+                "rank": 2,
+                "name": "VCP OVL",
+                "float": false
+            },
+            "parts": []
+        },
         {
             "externalId": "00000000:00000000:00000003",
             "name": "JINGLE1",

diff --git a/scripts/bundle.ts b/scripts/bundle.ts
@@ -1,7 +1,7 @@
-import { BlueprintManifestSet } from '@tv2media/blueprints-integration'
 import * as fs from 'fs'
 import * as _ from 'underscore'
 import * as util from 'util'
+import { BlueprintManifestSet } from '../src/types/blueprints-integration'
 const { BlueprintBundles } = require('./blueprint-map')
 
 const readFile = util.promisify(fs.readFile)

diff --git a/shelf-layouts/Kommentator.json b/shelf-layouts/Kommentator.json
@@ -112,7 +112,7 @@
     {
       "_id": "YC7RNPTbkXd5wnagp",
       "type": "filter",
-      "name": "KG ELEMENTER",
+      "name": "OVERLAY ELEMENTER",
       "currentSegment": false,
       "displayStyle": "list",
       "rank": 0,
@@ -127,7 +127,8 @@
         "studio0_graphicsIdent",
         "studio0_graphicsIdent_persistent",
         "studio0_graphicsTop",
-        "studio0_graphicsLower"
+        "studio0_graphicsLower",
+        "studio0_pilotOverlay"
       ],
       "tags": [
         "kommentator"
@@ -160,22 +161,6 @@
       "showThumbnailsInList": true,
       "toggleOnSingleClick": true
     },
-    {
-      "_id": "LiFso7gPYn2SPwHwg",
-      "type": "external_frame",
-      "name": "Mic tally",
-      "currentSegment": false,
-      "displayStyle": "buttons",
-      "rank": 0,
-      "rundownBaseline": false,
-      "default": false,
-      "x": 0,
-      "y": 0,
-      "width": 22,
-      "height": 7,
-      "url": "https://sisyfos.sofsrv04-od.tv2.local?view=mic-tally",
-      "scale": 0
-    },
     {
       "_id": "6GDpdq547HjjZL9YK",
       "type": "adlib_region",
@@ -418,23 +403,46 @@
       "showPartTitle": true
     },
     {
-      "_id" : "jLzHen2LoGEMxE68N",
-      "type" : "mini_rundown",
-      "name" : "Mini rundown",
-      "currentSegment" : false,
-      "displayStyle" : "buttons",
-      "rank" : 0,
-      "rundownBaseline" : false,
-      "showThumbnailsInList" : false,
-      "hideDuplicates" : false,
-      "default" : false,
-      "nextInCurrentPart" : false,
-      "oneNextPerSourceLayer" : false,
-      "x" : 7,
-      "y" : 0,
-      "width" : 14,
-      "height" : 7,
-      "scale" : 0
+      "_id": "h9xDp3HvzLaSo4yJi",
+      "type": "mini_rundown",
+      "name": "Mini rundown",
+      "currentSegment": false,
+      "displayStyle": "buttons",
+      "rank": 0,
+      "rundownBaseline": false,
+      "showThumbnailsInList": false,
+      "hideDuplicates": false,
+      "default": false,
+      "nextInCurrentPart": false,
+      "oneNextPerSourceLayer": false,
+      "x": 3,
+      "y": 3.8,
+      "width": 16,
+      "height": 3,
+      "scale": 0
+    },
+    {
+      "_id": "dkKTHZAwF98aKkD47",
+      "type": "external_frame",
+      "name": "Mic tally",
+      "currentSegment": false,
+      "displayStyle": "buttons",
+      "rank": 0,
+      "rundownBaseline": false,
+      "showThumbnailsInList": false,
+      "hideDuplicates": false,
+      "default": false,
+      "nextInCurrentPart": false,
+      "oneNextPerSourceLayer": false,
+      "url": "http://sofqb06-od:1176/?view=mic-tally",
+      "x": 3,
+      "y": 0,
+      "width": 16,
+      "height": 5,
+      "customClasses": [
+        ""
+      ],
+      "scale": 0
     }
   ],
   "type": "dashboard_layout",
@@ -451,26 +459,27 @@
     },
     {
       "_id": "m4ouEduSAvNXm6WZh",
-      "label": "▲ Previous Segment",
+      "label": "▲",
       "type": "move_previous_segment",
       "x": 0,
-      "y": 0,
-      "width": 6,
+      "y": 4,
+      "width": 2,
       "height": 1,
       "labelToggled": ""
     },
     {
       "_id": "FgyddcqkKFhSQeMBS",
-      "label": "▼ Next Segment",
+      "label": "▼",
       "type": "move_next_segment",
       "x": 0,
-      "y": 2,
-      "width": 6,
+      "y": 6,
+      "width": 2,
       "height": 1,
       "labelToggled": ""
     }
   ],
   "exposeAsStandalone": true,
+  "regionId": "shelf_layouts",
   "exposeAsShelf": true,
   "iconColor": "#8e44ad",
   "icon": {
@@ -486,6 +495,5 @@
   },
   "openByDefault": true,
   "startingHeight": 80,
-  "disableContextMenu": true,
-  "regionId": "shelf_layouts"
+  "disableContextMenu": true
 }
diff --git a/shelf-layouts/Mini_Shelf_Layout.json b/shelf-layouts/Mini_Shelf_Layout.json
@@ -3,6 +3,7 @@
 	"type": "dashboard_layout",
 	"icon": "",
 	"iconColor": "#ffffff",
+	"isDefaultLayout": true,
 	"regionId": "mini_shelf_layouts",
 	"filters": [
 		{
@@ -31,4 +32,4 @@
 			"toggleOnSingleClick": true
 		}
 	]
-}
+}