From abbe698f5c981bc784d0a832e4b7209d5ce7cee7 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Sun, 12 Jan 2025 15:23:20 -0500
Subject: [PATCH 1/3] Update GitHub Actions

---
 .github/workflows/test.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7b4840e9..c0dd4fc1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,23 +5,19 @@ on: [push, pull_request]
 jobs:
   test:
     runs-on: macos-latest
-
     steps:
-      - uses: FedericoCarboni/setup-ffmpeg@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: FedericoCarboni/setup-ffmpeg@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
-          cache: 'yarn'
+          cache: "yarn"
 
       - run: yarn install --frozen-lockfile
       - run: npm run lint
       - run: npm run test
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: video
           path: editly-out.mp4

From 7c8abdc2a12669523ebc483d87acf720475a2db9 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Sun, 12 Jan 2025 15:51:31 -0500
Subject: [PATCH 2/3] Fix lint errors

---
 examples/customCanvas.js              | 2 +-
 examples/customFabric.js              | 2 +-
 examples/fabricImagePostProcessing.js | 2 +-
 examples/renderSingleFrame.js         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/customCanvas.js b/examples/customCanvas.js
index 2df986fc..0fd4c165 100644
--- a/examples/customCanvas.js
+++ b/examples/customCanvas.js
@@ -1,4 +1,4 @@
-import editly from '..';
+import editly from '../index.js';
 
 async function func({ canvas }) {
   async function onRender(progress) {
diff --git a/examples/customFabric.js b/examples/customFabric.js
index 6e092a3c..cf4c223c 100644
--- a/examples/customFabric.js
+++ b/examples/customFabric.js
@@ -1,4 +1,4 @@
-import editly from '..';
+import editly from '../index.js';
 
 /* eslint-disable spaced-comment,no-param-reassign */
 
diff --git a/examples/fabricImagePostProcessing.js b/examples/fabricImagePostProcessing.js
index f770f61c..ac061ad8 100644
--- a/examples/fabricImagePostProcessing.js
+++ b/examples/fabricImagePostProcessing.js
@@ -1,4 +1,4 @@
-import editly from '..';
+import editly from '../index.js';
 
 // See https://github.com/mifi/editly/pull/222
 
diff --git a/examples/renderSingleFrame.js b/examples/renderSingleFrame.js
index 3d4402d7..d396538d 100644
--- a/examples/renderSingleFrame.js
+++ b/examples/renderSingleFrame.js
@@ -2,7 +2,7 @@ import { parse } from 'json5';
 import fsExtra from 'fs-extra';
 
 // eslint-disable-next-line import/named
-import { renderSingleFrame } from '..';
+import { renderSingleFrame } from '../index.js';
 
 (async () => {
   await renderSingleFrame({

From a4d7935911c8fad044e8eabeebe9673a42cf3ce1 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <brandon@opensoul.org>
Date: Sun, 12 Jan 2025 15:37:29 -0500
Subject: [PATCH 3/3] Get test running on Linux and Mac

---
 .github/workflows/test.yml | 39 +++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c0dd4fc1..51fb952d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,22 +1,47 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [main]
+  pull_request:
 
 jobs:
   test:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    env:
+      DISPLAY: :0
     steps:
-      - uses: FedericoCarboni/setup-ffmpeg@v3
+      - if: runner.os == 'macOS'
+        run: brew install ffmpeg
+      - if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update && sudo apt-get install -y \
+            build-essential \
+            ffmpeg \
+            libcairo2-dev \
+            libgif-dev \
+            libglew-dev \
+            libglu1-mesa-dev \
+            libjpeg-dev \
+            libpango1.0-dev \
+            librsvg2-dev \
+            libxi-dev \
+            pkg-config
+      - if: runner.os == 'Linux'
+        run: sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 22
           cache: "yarn"
-
-      - run: yarn install --frozen-lockfile
+          cache-dependency-path: ./package.json
+      - run: yarn install
       - run: npm run lint
       - run: npm run test
-
       - uses: actions/upload-artifact@v4
         with:
           name: video