Update workflows

This *should* fix the workflows. The build-* workflows no longer publish a new release, instead there's a new release workflow that builds the mod (and later the server, assuming that's wanted). Also updated the Dockerfile with direction from Husky, but some additional work is needed.

Author: Protonull

.github/workflows/build-mod.yml

@@ -1,4 +1,4 @@
-name: Build Mod
+name: "Build Mods"
 
 on:
   push:
@@ -7,39 +7,20 @@ on:
   pull_request:
     paths:
       - "mod/**/*"
+  workflow_call:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - uses: "actions/checkout@v4"
+
+      - name: "Setting up JDK 17"
+        uses: "actions/setup-java@v4"
         with:
           java-version: "17"
           distribution: "adopt"
-      - run: ./gradlew build
-        working-directory: ./mod
-
-      - name: Upload Forge Build
-        uses: actions/upload-artifact@v3
-        with:
-          name: Forge
-          path: mod/dist/*-forge.jar
 
-      - name: Upload Fabric Build
-        uses: actions/upload-artifact@v3
-        with:
-          name: Fabric
-          path: mod/dist/*-fabric.jar
-
-      - name: Release Tag
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: softprops/action-gh-release@v1
-        with:
-          prerelease: true
-          fail_on_unmatched_files: true
-          files: |
-            mod/dist/*.jar
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Building mods"
+        working-directory: "./mod"
+        run: "./gradlew build"

.github/workflows/build-server.yml

@@ -1,4 +1,4 @@
-name: Build+Test Server
+name: "Build+Test Server"
 
 on:
   push:
@@ -7,20 +7,31 @@ on:
   pull_request:
     paths:
       - "server/**/*"
+  workflow_call:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        version: ["1.2.15", "latest"]
+    runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup bun.sh
-        uses: oven-sh/setup-bun@v1
+      - uses: "actions/checkout@v4"
+
+      - name: "Setting up Bun"
+        uses: oven-sh/setup-bun@v2
         with:
-          bun-version: ${{ matrix.version }}
-      - run: bun install
-        working-directory: ./server
-      - run: bun test
-        working-directory: ./server
+          bun-version: latest
+
+      - name: "Setting up yarn"
+        working-directory: "./server"
+        run: "yarn"
+
+      - name: "Checking types"
+        working-directory: "./server"
+        run: "yarn run check:types"
+
+      - name: "Checking style"
+        working-directory: "./server"
+        run: "yarn run check:style"
+
+      - name: "Testing server"
+        working-directory: "./server"
+        run: "yarn run test"

.github/workflows/release.yml

@@ -0,0 +1,35 @@
+name: "Publishing to release"
+
+on:
+  release:
+    types:
+      - "published"
+
+permissions:
+  contents: "write"
+
+jobs:
+  release-mod:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v4"
+
+      - name: "Setting up JDK 17"
+        uses: "actions/setup-java@v4"
+        with:
+          java-version: "17"
+          distribution: "adopt"
+
+      - name: "Building mods"
+        working-directory: "./mod"
+        run: "./gradlew build"
+
+      - name: "Publishing mods"
+        working-directory: "./mod"
+        run: |
+          for file in $(find "dist/" -maxdepth 1 -type f -name "*.jar"); do
+            echo "Uploading $file"
+            gh release upload ${{ github.event.release.tag_name }} "$file" --clobber
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,5 +1,6 @@
 # base is shared between build/test and deploy
-FROM node:18-alpine AS base
+# See options at: https://hub.docker.com/r/oven/bun
+FROM oven/bun:latest AS base
 
 WORKDIR /usr/src/app/
 
@@ -8,29 +9,28 @@ COPY ./server/package.json /usr/src/app/package.json
 
 FROM base AS build
 
-COPY ./server/yarn.lock /usr/src/app/yarn.lock
-RUN yarn
+COPY ./server/bun.lock /usr/src/app/bun.lock
+COPY ./server/bunfig.toml /usr/src/app/bunfig.toml
+RUN bun install
 
 # copy source as late as possible, to reuse docker cache with node_modules
 COPY ./server /usr/src/app
-RUN yarn build
-
-FROM build AS test
-RUN yarn test
 
 # final image only includes minimal files
 FROM base AS deploy
 
+COPY --from=build /usr/src/app/bun.lock /usr/src/app/bun.lock
+COPY --from=build /usr/src/app/bunfig.toml /usr/src/app/bunfig.toml
 COPY --from=build /usr/src/app/node_modules /usr/src/app/node_modules
-COPY --from=build /usr/src/app/dist /usr/src/app/dist
+COPY --from=build /usr/src/app/src /usr/src/app/src
 
 ENV NODE_ENV=production
 ENV HOST=0.0.0.0
 
 #Mount your FS or volume or whatnot to this folder
-RUN mkdir /data
+# TODO: Fix env override of config data
 ENV MAPSYNC_DATA_DIR=/data
 
-EXPOSE 12312/tcp
+# EXPOSE 12312/tcp
 
-CMD [ "yarn", "start" ]
+CMD [ "bun", "run", "start" ]

server/package.json

@@ -7,11 +7,12 @@
     "type": "module",
     "module": "src/main.ts",
     "scripts": {
-        "format": "bunx prettier -w .",
+        "check:types": "bunx --bun tsc --noEmit --checkJs",
+        "check:style": "bunx --bun prettier --check .",
+        "format": "bunx --bun prettier -w .",
         "test": "bun test ./src/*.test.ts",
         "start": "bun src/main.ts",
         "start:dev": "bun --inspect src/main.ts",
-        "check": "bunx tsc",
         "compile": "bun build --compile . --outfile out/mapsync-server"
     },
     "dependencies": {