add: 1984 skyratupdate

.github/workflows/ci_suite.yml

@@ -1,18 +1,19 @@
 name: CI Suite
 on:
+  workflow_call:
   push:
     branches:
-    - master
+    - nova
     - 'project/**'
     - 'gh-readonly-queue/master/**'
     - 'gh-readonly-queue/project/**'
   pull_request:
     branches:
-    - master
+    - nova
     - 'project/**'
   merge_group:
     branches:
-    - master
+    - nova
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -89,6 +90,7 @@ jobs:
         run: |
           bash tools/ci/check_grep.sh
           bash modular_nova/tools/nova_check_grep.sh # NOVA EDIT ADDITION - checking modular_nova code
+          bash ss220/tools/ss220_check_grep.sh # SS220 EDIT ADDITION - checking modular_ss220 code
       - name: Ticked File Enforcement
         if: steps.linter-setup.conclusion == 'success' && !cancelled()
         run: |

.github/workflows/conflicts.yml

@@ -0,0 +1,19 @@
+name: 'Merge Conflict Detection'
+on:
+  push:
+    branches:
+      - master220
+      - 'project/**'
+  pull_request_target:
+    types: [ready_for_review, opened, synchronize, reopened]
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: eps1lon/[email protected]
+        with:
+          dirtyLabel: 'Merge Conflict'
+          repoToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy.yml

@@ -0,0 +1,43 @@
+name: Deploy
+
+concurrency:
+  group: deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      ci_required:
+        description: 'CI Suite is required'
+        type: boolean
+        required: true
+        default: true
+      perform_deploy_skyrat_main:
+        description: 'Deploy Skyrat Main'
+        type: boolean
+        required: true
+        default: true
+
+jobs:
+  CI:
+    uses: ./.github/workflows/ci_suite.yml  # use the callable tests job to run tests
+    if: ${{ inputs.ci_required }}
+
+  deploy-skyrat-main:
+    name: Deploy Skyrat Main
+    runs-on: ubuntu-latest
+    needs: [CI]
+    if: always() && !cancelled() && !failure() && inputs.perform_deploy_skyrat_main
+
+    steps:
+    - name: Update and Build Skyrat Main
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.PRODUCTION_HOST }}
+        username: ${{ secrets.PRODUCTION_USERNAME }}
+        key: ${{ secrets.PRODUCTION_SSH_KEY }}
+        passphrase: ${{ secrets.PRODUCTION_SSH_KEY_PASS }}
+        script: |
+          TIME=$(date +'%Y-%m-%d%T')
+          sudo systemctl --wait start deploy-skyrat-main
+          journalctl --since $TIME -u deploy-skyrat-main --no-pager --all
+          systemctl is-failed deploy-skyrat-main | grep -q "failed" && echo "Deployment Failed!" && exit 1 || exit 0

.github/workflows/docker_publish.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   publish:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/run_integration_tests.yml

@@ -19,16 +19,16 @@ on:
 
 jobs:
   run_integration_tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 15
     services:
       mysql:
-        image: mysql:latest
+        image: mariadb:latest
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
           - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+        options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v4
       - name: Restore BYOND cache

.gitignore

@@ -250,3 +250,7 @@ define_sanity_output.txt
 
 # Running OpenDream locally
 tgstation.json
+
+# Ignore cached sound files.
+/sound/tts_cache/**/*
+/sound/tts_scrambled/**/*

Dockerfile

@@ -60,14 +60,14 @@ RUN apt-get install -y --no-install-recommends \
         gcc-multilib \
         git \
     && git init \
-    && git remote add origin https://github.com/tgstation/rust-g
+    && git remote add origin https://github.com/ss220-space/rust-g-tg
 
 COPY dependencies.sh .
 
 RUN . ./dependencies.sh \
     && git fetch --depth 1 origin "${RUST_G_VERSION}" \
     && git checkout FETCH_HEAD \
-    && env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target i686-unknown-linux-gnu
+    && env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target i686-unknown-linux-gnu --all-features
 
 # final = byond + runtime deps + rust_g + build
 FROM byond