Merge branch 'develop'

nrkno · Feb 19, 2024 · f990b86 · f990b86
2 parents 03aca9f + cb20950
commit f990b86
Show file tree

Hide file tree

Showing 148 changed files with 4,989 additions and 2,875 deletions.
diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
@@ -35,7 +35,6 @@ jobs:
 
       - name: Sign executables
         shell: bash
-        continue-on-error: true
         env:
           WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
         run: |
@@ -45,7 +44,7 @@ jobs:
 
             for FILE in deploy/*.exe; do
               echo "Trying to sign ${FILE}"
-              # This path is a bit fragile, but necessary as no signtool is on the path. 
+              # This path is a bit fragile, but necessary as no signtool is on the path.
               # If this path breaks, then find what versions of windows kits are installed in the updated runner image https://github.com/actions/runner-images#available-images
               'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign //fd SHA256 //f certificate.pfx //p "${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}" $FILE
             done
@@ -54,11 +53,13 @@ jobs:
           fi
 
       - name: Verify build
+        if: '!cancelled()'
         run: yarn verify:build-win32
         env:
           CI: true
 
       - name: Upload artifacts
+        if: '!cancelled()'
         uses: actions/upload-artifact@v4
         with:
           name: Windows

diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
@@ -29,7 +29,9 @@ jobs:
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
       - name: Prepare Environment
-        run: yarn
+        run: |
+          yarn config set network-timeout 100000 -g
+          yarn
         env:
           CI: true
       - name: Type check
@@ -46,6 +48,7 @@ jobs:
     name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         node_version: ['16']
         os: [ubuntu-latest, windows-latest] # [windows-latest, macOS-latest]
@@ -65,6 +68,7 @@ jobs:
 
       - name: Prepare Environment
         run: |
+          yarn config set network-timeout 100000 -g
           yarn
           yarn build
         env:

diff --git a/.github/workflows/publish-prerelease.yaml b/.github/workflows/publish-prerelease.yaml
@@ -6,26 +6,32 @@ on:
 
 jobs:
   test:
-    name: Test
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-
+    name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        node_version: ['16']
+        os: [ubuntu-latest, windows-latest] # [windows-latest, macOS-latest]
+    timeout-minutes: 10
     steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
-      - name: Use Node.js
+      - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: ${{ matrix.node_version }}
+
       - name: Prepare Environment
-        run: yarn
-        env:
-          CI: true
-      - name: Build
-        run: yarn build
+        run: |
+          yarn config set network-timeout 100000 -g
+          yarn
+          yarn build
         env:
           CI: true
-      - name: Run tests
-        run: yarn test:ci
+      - name: Run unit tests
+        run: |
+          yarn test:ci
         env:
           CI: true
 
@@ -59,7 +65,9 @@ jobs:
           fi
       - name: Prepare Environment
         if: ${{ steps.do-publish.outputs.publish }}
-        run: yarn
+        run: |
+          yarn config set network-timeout 100000 -g
+          yarn
         env:
           CI: true
       - name: Build

diff --git a/apps/appcontainer-node/packages/generic/package.json b/apps/appcontainer-node/packages/generic/package.json
@@ -9,6 +9,9 @@
         "build:main": "tsc -p tsconfig.json",
         "__test": "jest"
     },
+    "peerDependencies": {
+        "@sofie-automation/shared-lib": "*"
+    },
     "dependencies": {
         "@sofie-package-manager/api": "1.43.2",
         "@sofie-package-manager/worker": "1.43.2",