diff options
| -rw-r--r-- | .github/workflows/release.yml | 17 | ||||
| -rw-r--r-- | bundle/src/Server.ts | 6 |
2 files changed, 3 insertions, 20 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d96bda3..6daea25b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,28 +14,12 @@ jobs: os: [windows, macos, ubuntu] include: - os: windows - pre: | - cmd /c "del /F /S /Q node_modules/@fosscord" - cmd /c "mklink /D node_modules/@fosscord/api ../api" - cmd /c "mklink /D node_modules/@fosscord/cdn ../cdn" - cmd /c "mklink /D node_modules/@fosscord/gateway ../gateway" - cmd /c "mklink /D node_modules/@fosscord/util ../util" build: npx caxa -i .. -m 'This_may_take_a_while_to_run_the_first_time_please_wait...' --output 'fosscord-server-windows.exe' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/bundle/dist/start.js' artifact: fosscord-server-windows.exe - os: macos - pre: | - ln -sf ../api node_modules/@fosscord/api - ln -sf ../cdn node_modules/@fosscord/cdn - ln -sf ../gateway node_modules/@fosscord/gateway - ln -sf ../util node_modules/@fosscord/util build: npx caxa -i .. -m 'This may take a while to run the first time, please wait...' --output 'fosscord-server.app' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/bundle/dist/start.js' && tar -czf 'fosscord-server-macos.app.tgz' 'fosscord-server.app' artifact: fosscord-server-macos.app.tgz - os: ubuntu - pre: | - ln -sf ../api node_modules/@fosscord/api - ln -sf ../cdn node_modules/@fosscord/cdn - ln -sf ../gateway node_modules/@fosscord/gateway - ln -sf ../util node_modules/@fosscord/util build: npx caxa -i .. -m 'This may take a while to run the first time, please wait...' --output 'fosscord' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/bundle/dist/start.js' && tar -czf 'fosscord-server-linux.tgz' 'fosscord' artifact: fosscord-server-linux.tgz runs-on: ${{ matrix.os }}-latest @@ -53,7 +37,6 @@ jobs: npm install npm i caxa npm run build - ${{ matrix.pre }} ${{ matrix.build }} - uses: actions/upload-artifact@v2 with: diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index faf8a324..6b4db8de 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -2,9 +2,9 @@ process.on("unhandledRejection", console.error); process.on("uncaughtException", console.error); import http from "http"; -import { FosscordServer as APIServer } from "@fosscord/api"; -import { Server as GatewayServer } from "@fosscord/gateway"; -import { CDNServer } from "@fosscord/cdn/"; +import { FosscordServer as APIServer } from "../../api"; +import { Server as GatewayServer } from "../../gateway"; +import { CDNServer } from "../../cdn/"; import express from "express"; import { Config } from "../../util/dist"; |