Split Desktop into its own repo (#743)

Co-authored-by: Mia Moir <[email protected]>

Author: markspolakovs

.dockerignore

@@ -8,8 +8,6 @@
 
 node_modules
 
-desktop/out/
-desktop/.vite/
 server/.next/
 jobrunner/dist/
 

.github/workflows/release.yml

@@ -75,7 +75,7 @@ jobs:
         env:
           PLAYWRIGHT_HTML_REPORT: ${{ github.workspace }}/server/playwright-report
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: playwright-report-server

.github/workflows/tests.yml

@@ -39,7 +39,7 @@ jobs:
           cache-dependency-path: "yarn.lock"
       - run: yarn install --immutable --inline-builds
 
-      - run: yarn prettier --check '{desktop,jobrunner,server}/**/*.{ts,tsx}'
+      - run: yarn prettier --check '{jobrunner,server}/**/*.{ts,tsx}'
 
   lint:
     runs-on: ubuntu-latest
@@ -87,7 +87,7 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./desktop/coverage/coverage-final.json,./server/coverage/coverage-final.json,./jobrunner/coverage/coverage-final.json,./utility/testing/coverage/coverage-final.json
+          files: ./server/coverage/coverage-final.json,./jobrunner/coverage/coverage-final.json,./utility/testing/coverage/coverage-final.json
 
   test-integration-server-jobrunner:
     runs-on: ubuntu-latest
@@ -108,7 +108,7 @@ jobs:
           cache: "yarn"
           cache-dependency-path: "yarn.lock"
 
-      - uses: FedericoCarboni/setup-ffmpeg@v3
+      - uses: afoley587/setup-ffmpeg@a7cd62787aaae92d7c452f79f85ab25e2b639bb0
         with:
           ffmpeg-version: "release"
 
@@ -150,6 +150,10 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable --inline-builds
 
+      - uses: afoley587/setup-ffmpeg@a7cd62787aaae92d7c452f79f85ab25e2b639bb0
+        with:
+          ffmpeg-version: "release"
+
       - name: Build server
         run: |
           yarn build
@@ -177,134 +181,9 @@ jobs:
         env:
           PLAYWRIGHT_HTML_REPORT: ${{ github.workspace }}/server/playwright-report
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report-server
           path: ./server/playwright-report/
           retention-days: 30
-
-  test-e2e-desktop-standalone:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    env:
-      NODE_ENV: test
-      E2E_TEST: "true"
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-          cache: "yarn"
-          cache-dependency-path: "yarn.lock"
-
-      - name: Install dependencies
-        run: yarn install --immutable --inline-builds
-
-      - name: Build desktop
-        run: yarn build
-        working-directory: ./desktop
-
-      - name: Make logs folder
-        run: mkdir -p ${{ runner.temp }}/logs
-
-      - name: Run Playwright tests
-        run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn ${{ runner.debug && 'test:e2e:debug' || 'test:e2e' }} --project standalone
-        working-directory: ./desktop
-        env:
-          PLAYWRIGHT_HTML_REPORT: ${{ github.workspace }}/desktop/playwright-report
-          BADGER_LOGS_PATH: ${{ runner.temp }}/logs
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report-desktop
-          path: |
-            ./desktop/playwright-report/
-            ./desktop/traces/
-            ./desktop/test-results/
-            ${{ runner.temp }}/logs
-          retention-days: 30
-
-  test-e2e-desktop-complete:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    env:
-      NODE_ENV: test
-      E2E_TEST: "true"
-      DATABASE_URL: postgres://root:postgres@localhost:5432/badger_test
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-          cache: "yarn"
-          cache-dependency-path: "yarn.lock"
-
-      - name: Docker Compose
-        uses: hoverkraft-tech/[email protected]
-
-      - name: Install dependencies
-        run: yarn install --immutable --inline-builds
-
-      - uses: FedericoCarboni/setup-ffmpeg@v3
-        with:
-          ffmpeg-version: "release"
-
-      - name: Build server
-        run: |
-          yarn build
-          cp -r public .next/standalone/server/public
-          mkdir -p .next/standalone/server/.next
-          cp -r .next/static .next/standalone/server/.next/static
-        working-directory: ./server
-
-      - name: Build Jobrunner
-        run: |
-          yarn build
-          cp ../utility/prisma/schema.prisma .
-        working-directory: ./jobrunner
-
-      - name: Build desktop
-        run: yarn build
-        working-directory: ./desktop
-
-      - name: Migrate database
-        run: yarn prisma:migrateProd
-
-      - name: Make logs folder
-        run: mkdir -p ${{ runner.temp }}/logs
-
-      - name: Start Jobrunner
-        run: |
-          node --enable-source-maps dist/index.cjs --watch --pidFile ${{ runner.temp }}/jobrunner.pid > ${{ runner.temp }}/logs/jobrunner.log 2>&1 &
-          npx -y wait-on file:/${{ runner.temp }}/jobrunner.pid
-        working-directory: ./jobrunner
-
-      - name: Start server
-        run: |
-          HOSTNAME=localhost node server/server.js > ${{ runner.temp }}/logs/server.log 2>&1 &
-          npx -y wait-on -v -t 120000 http://localhost:3000/api/healthz
-        working-directory: ./server/.next/standalone
-
-      - name: Run Playwright tests
-        run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn ${{ runner.debug && 'test:e2e:debug' || 'test:e2e' }} --project complete
-        working-directory: ./desktop
-        env:
-          PLAYWRIGHT_HTML_REPORT: ${{ github.workspace }}/desktop/playwright-report
-          BADGER_LOGS_PATH: ${{ runner.temp }}/logs
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report-desktop
-          path: |
-            ./desktop/playwright-report/
-            ./desktop/traces/
-            ./desktop/test-results/
-            ${{ runner.temp }}/logs
-          retention-days: 30

Dockerfile.common

@@ -7,8 +7,6 @@ FROM base AS build
 WORKDIR /app
 COPY ./.yarn/ .yarn/
 COPY .yarnrc.yml .yarnrc.yml
-# desktop needs to be included, even if we're not building it, otherwise yarn install fails
-COPY desktop desktop/
 COPY server server/
 COPY jobrunner jobrunner/
 COPY utility utility/

Dockerfile.jobrunner

@@ -7,7 +7,6 @@ FROM base AS build
 WORKDIR /app
 COPY ./.yarn/ .yarn/
 COPY .yarnrc.yml .yarnrc.yml
-COPY desktop desktop/
 COPY server server/
 COPY jobrunner jobrunner/
 COPY utility utility/

Dockerfile.server

@@ -7,7 +7,6 @@ FROM base AS build
 WORKDIR /app
 COPY ./.yarn/ .yarn/
 COPY .yarnrc.yml .yarnrc.yml
-COPY desktop desktop/
 COPY server server/
 COPY jobrunner jobrunner/
 COPY utility utility/

README.md

@@ -17,7 +17,7 @@ Badger is made up of three components:
 
 - `server`, a [Next.js](https://nextjs.org/) app which handles the web interface and API
 - `jobrunner`, a standalone [Node.js](https://nodejs.org/en/) service which handles the media processing
-- `desktop`, a [Electron](https://www.electronjs.org/) app which handles the OBS integration
+- `desktop`, a [Electron](https://www.electronjs.org/) app which handles the OBS integration. Desktop lives [in its own repository](https://github.com/badger-media/badger-desktop)
 
 All of these components are written in [TypeScript](https://www.typescriptlang.org/).
 
@@ -32,7 +32,6 @@ It also interfaces with a few other services:
 _If you're looking to set up a development instance, follow the [contributing guide](./CONTRIBUTING.md) instead._
 
 Every release has Docker images published at `ghcr.io/badger-media/badger/server` and `ghcr.io/badger-media/badger/jobrunner`.
-We also create Desktop builds (Windows-only for now) in the [releases](https://github.com/ystv/badger/releases) section on GitHub.
 There is an example [docker-compose file](./docker-compose-example.yml) in the repository which runs server, jobrunner, and all dependencies.
 
 Server and Jobrunner are configured by setting environment variables. A minimal set (both use the same variables) is: