Merge pull request #684 from Mastergamer433/dev2

Dev2

.github/workflows/release.yml

@@ -0,0 +1,104 @@
+name: CI
+
+on:
+  push:
+    branches: [main, next, dev]
+  pull_request:
+    branches: [main, next, dev]
+  workflow_dispatch:
+
+env:
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Cache Node.js dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build TypeScript source code
+        run: npm run build
+
+      - name: Semantic Release
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npx semantic-release
+
+      - name: Store build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: .  # Include all files in the artifact
+          path-ignore: node_modules
+
+  docker:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: build-artifacts
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            zyner/xyter
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
+        run: docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to Container registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64

Dockerfile

@@ -1,12 +1,12 @@
 # Dependencies
-FROM node:19-alpine3.17 AS dependencies
+FROM node:20-alpine3.21 AS dependencies
 
 WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm install
 
 # Build
-FROM node:19-alpine3.17 AS build
+FROM node:20-alpine3.21 AS build
 
 WORKDIR /app
 COPY --from=dependencies /app/node_modules ./node_modules
@@ -15,7 +15,7 @@ COPY . .
 RUN npx prisma generate && npm run build
 
 # Deploy
-FROM node:19-alpine3.17 as deploy
+FROM node:20-alpine3.20 as deploy
 
 WORKDIR /app
 

docker-compose.yml

@@ -1,8 +1,7 @@
-version: "3.7"
 services:
   xyter:
     container_name: xyter
-    image: registry.zyner.org/zyner/xyter/bot
+    image: zyner/xyter
     #build:
     #  context: .
     restart: unless-stopped