Merge branch 'master' of https://github.com/bitfocus/companion into m…

…aster
eric · Jun 25, 2021 · 13ab1dc · 13ab1dc
2 parents 804258b + b136a51
commit 13ab1dc
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 401 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -1,12 +1,12 @@
-name: Node CI
+name: Format check
 on: [push, pull_request]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js ${{ matrix.node-version }}

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -1,12 +1,12 @@
-name: Node CI
+name: Build binaries
 on: [push]
 
 jobs:
   linux64:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js ${{ matrix.node-version }}
@@ -26,16 +26,16 @@ jobs:
       - name: rename and upload stuff
         run: node ./tools/build_rename_git.js
         env:
-          TRAVIS_OS_NAME: linux
+          CI_BUILD_OS: linux
           BITFOCUS_S3: ${{ secrets.BITFOCUS_S3 }}
           BITFOCUS_KEY: ${{ secrets.BITFOCUS_ACCESS }}
           BITFOCUS_SECRET: ${{ secrets.BITFOCUS_SECRET }}
 
   osx:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js ${{ matrix.node-version }}
@@ -49,16 +49,41 @@ jobs:
       - name: rename and upload stuff
         run: node ./tools/build_rename_git.js
         env:
-          TRAVIS_OS_NAME: osx
+          CI_BUILD_OS: osx
+          CI_BUILD_ARCH: x64
           BITFOCUS_S3: ${{ secrets.BITFOCUS_S3 }}
           BITFOCUS_KEY: ${{ secrets.BITFOCUS_ACCESS }}
           BITFOCUS_SECRET: ${{ secrets.BITFOCUS_SECRET }}
 
+  # osx-arm64:
+  #   runs-on: macos-11
+  #   strategy:
+  #     matrix:
+  #       node-version: [14.x]
+  #   steps:
+  #     - uses: actions/checkout@v1
+  #     - name: Use Node.js ${{ matrix.node-version }}
+  #       uses: actions/setup-node@v1
+  #       with:
+  #         node-version: ${{ matrix.node-version }}
+  #     - name: yarn update and macarmdist
+  #       run: |
+  #         yarn update
+  #         yarn run macarmdist
+  #     - name: rename and upload stuff
+  #       run: node ./tools/build_rename_git.js
+  #       env:
+  #         CI_BUILD_OS: osx
+  #         CI_BUILD_ARCH: arm64
+  #         BITFOCUS_S3: ${{ secrets.BITFOCUS_S3 }}
+  #         BITFOCUS_KEY: ${{ secrets.BITFOCUS_ACCESS }}
+  #         BITFOCUS_SECRET: ${{ secrets.BITFOCUS_SECRET }}
+
   win64:
     runs-on: windows-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js ${{ matrix.node-version }}
@@ -75,7 +100,7 @@ jobs:
       - name: rename and upload stuff
         run: node ./tools/build_rename_git.js
         env:
-          TRAVIS_OS_NAME: win64
+          CI_BUILD_OS: win64
           BITFOCUS_S3: ${{ secrets.BITFOCUS_S3 }}
           BITFOCUS_KEY: ${{ secrets.BITFOCUS_ACCESS }}
           BITFOCUS_SECRET: ${{ secrets.BITFOCUS_SECRET }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:14
 # Reference: https://nodejs.org/en/docs/guides/nodejs-docker-webapp/
 
 WORKDIR /root

diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
 		"appId": "companion.bitfocus.no",
 		"remoteBuild": false,
 		"dmg": {
+			"artifactName": "companion-mac-${arch}.dmg",
 			"sign": true
 		},
 		"mac": {
@@ -19,7 +20,7 @@
 			},
 			"extraFiles": [
 				{
-					"from": "./node_modules/sharp/vendor/8.10.5/lib",
+					"from": "./node_modules/sharp/vendor/8.10.6/lib",
 					"to": "Frameworks",
 					"filter": [
 						"!glib-2.0/**/*"
@@ -58,7 +59,7 @@
 			"target": "dir",
 			"extraFiles": [
 				{
-					"from": "./node_modules/sharp/vendor/8.10.5/lib",
+					"from": "./node_modules/sharp/vendor/8.10.6/lib",
 					"to": ".",
 					"filter": [
 						"libvips*.so.*"
@@ -95,13 +96,15 @@
 		"dist": "yarn dist:prepare && yarn electron-rebuild && electron-builder",
 		"electron-rebuild": "yarn dist:prepare:sharp && electron-builder install-app-deps",
 		"testprod": "./node_modules/electron/cli.js .",
-		"macdist": "yarn dist:prepare && yarn dist:prepare:mac && electron-builder --publish=never  --x64 --mac",
+		"macdist": "yarn dist:prepare && yarn dist:prepare:mac-x64 && electron-builder --publish=never  --x64 --mac",
+		"macarmdist": "yarn dist:prepare && yarn dist:prepare:mac-arm64 && electron-builder --publish=never  --arm64 --mac",
 		"windist": "yarn dist:prepare && yarn dist:prepare:win && electron-builder --publish=never  --x64 --win",
 		"lindist": "yarn dist:prepare && yarn dist:prepare:linux && electron-builder --publish=never  --x64 --linux",
 		"rpidist": "yarn dist:prepare && yarn dist:prepare:rpi && electron-builder --publish=never  --armv7l --linux",
 		"dist:prepare:sharp": "cd node_modules/sharp && rimraf vendor && node install/libvips && node install/dll-copy",
 		"dist:prepare:win": "cross-env npm_config_platform=win32 npm_config_arch=x64 yarn dist:prepare:sharp",
-		"dist:prepare:mac": "cross-env npm_config_platform=darwin npm_config_arch=x64 yarn dist:prepare:sharp",
+		"dist:prepare:mac-x64": "cross-env npm_config_platform=darwin npm_config_arch=x64 yarn dist:prepare:sharp",
+		"dist:prepare:mac-arm64": "cross-env npm_config_platform=darwin npm_config_arch=arm64 yarn dist:prepare:sharp",
 		"dist:prepare:linux": "cross-env npm_config_platform=linux npm_config_arch=x64 yarn dist:prepare:sharp",
 		"dist:prepare:rpi": "cross-env npm_config_platform=linux npm_config_arch=arm yarn dist:prepare:sharp",
 		"test": "mocha",
@@ -119,18 +122,18 @@
 	"engines": {
 		"npm": "please-use-yarn",
 		"yarn": "^1.22",
-		"node": "^12.20 || ^14"
+		"node": "^14.16"
 	},
 	"author": "Bitfocus AS",
 	"license": "MIT",
 	"devDependencies": {
 		"asar": "^3.0.3",
-		"aws-sdk": "^2.927.0",
+		"aws-sdk": "^2.931.0",
 		"chai": "^4.3.4",
 		"chai-fs": "^2.0.0",
 		"cross-env": "^7.0.3",
-		"electron": "^11.4.8",
-		"electron-builder": "22.10.5",
+		"electron": "^13.1.2",
+		"electron-builder": "22.11.7",
 		"mocha": "^6.2.3",
 		"nodemon": "^2.0.7",
 		"p-all": "^3.0.0",
@@ -139,7 +142,7 @@
 		"s3-upload-stream": "^1.0.7"
 	},
 	"dependencies": {
-		"@sentry/electron": "^2.4.1",
+		"@sentry/electron": "^2.5.0",
 		"app-root-path": "^3.0.0",
 		"binopsy": "^0.0.0",
 		"check-ip": "^1.1.1",
@@ -433,7 +436,7 @@
 		"node-rest-client": "^3.1.0",
 		"osc": "^2.4.1",
 		"pngjs": "^3.3.3",
-		"sharp": "^0.27.2",
+		"sharp": "^0.28.3",
 		"shortid": "^2.2.16",
 		"socket.io": "^4.1.2",
 		"strip-ansi": "^5.2.0",
@@ -448,8 +451,7 @@
 	},
 	"resolutions": {
 		"infinitton-idisplay/node-hid": "^2.1.1",
-		"electron-builder/**/app-builder-bin": "3.5.13",
-		"**/osc/serialport": "^9.1.0",
+		"**/osc/serialport": "^9.2.0",
 		"**/osc/ws": "^7.4.6"
 	}
 }
diff --git a/tools/build_rename_git.js b/tools/build_rename_git.js
@@ -93,24 +93,25 @@ async function run() {
 	let artifact_source
 	let artifact_dest
 
-	if (process.env.TRAVIS_OS_NAME === 'osx') {
+	if (process.env.CI_BUILD_OS === 'osx') {
+		const arch = process.env.CI_BUILD_ARCH
 		artifact_source = list.find((file) => file.match(/\.dmg$/))
-		artifact_dest = `companion-${build}-mac.dmg`
+		artifact_dest = `companion-${build}-mac-${arch}.dmg`
 		console.log('OSX')
-	} else if (process.env.TRAVIS_OS_NAME === 'linux') {
+	} else if (process.env.CI_BUILD_OS === 'linux') {
 		artifact_source = list.find((file) => file.match(/\.gz$/))
 		artifact_dest = `companion-${build}-linux.tar.gz`
 		console.log('LINUX')
-	} else if (process.env.TRAVIS_OS_NAME === 'win64') {
+	} else if (process.env.CI_BUILD_OS === 'win64') {
 		artifact_source = list.find((file) => file.match(/\.exe$/))
 		artifact_dest = `companion-${build}-win64.exe`
 		console.log('WINDOWS')
-	} else if (process.env.TRAVIS_OS_NAME === 'armv7l') {
+	} else if (process.env.CI_BUILD_OS === 'armv7l') {
 		artifact_source = list.find((file) => file.match(/\.z$/))
 		artifact_dest = `companion-${build}-armv7l.tar.gz`
 		console.log('ARM')
 	} else {
-		console.error(`Unknown operating system: ${process.env.TRAVIS_OS_NAME}`)
+		console.error(`Unknown operating system: ${process.env.CI_BUILD_OS}`)
 		process.exit(1)
 	}
 

diff --git a/tools/yarn.sh b/tools/yarn.sh
@@ -24,14 +24,14 @@ function heading() {
 
 heading "Check Node version"
 NODE_VERSION=$(node -v)
-NODE_IS_CORRECT=$(npx semver --range "^12.20 || ^14" $NODE_VERSION)
+REQUIRED_VERSION=$(node -p -e "require('./package.json').engines.node")
+NODE_IS_CORRECT=$(npx semver --range "$REQUIRED_VERSION" $NODE_VERSION)
 echo "Found ${NODE_VERSION}"
 if [ "$NODE_IS_CORRECT" ]; then
 	echo "Node version is OK "
 else
-	echo "The installed version of NodeJS is not supported, v12.20+ is required."
+	echo "The installed version of NodeJS is not supported, \"$REQUIRED_VERSION\" is required."
 	echo "It is recommended that you update NodeJS (the same way you installed it)."
-	echo "Alternatively, you can run \`git checkout stable-2.1\` and \`yarn update\` to stick to future 2.1 versions, but this is unlikely to get many (if any) updates"
 	exit 7
 fi