Merge branch 'master' of https://github.com/tgstation/rust-g into bbcode

tgstation · Apr 21, 2024 · cbef232 · cbef232
2 parents 79558d1 + bd5c3af
commit cbef232
Show file tree

Hide file tree

Showing 15 changed files with 2,115 additions and 934 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,3 +9,6 @@ insert_final_newline = true
 
 [*.dm]
 indent_style = tab
+
+[*.yml]
+indent_size = 2
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Build (release) (default features)
         run: cargo build --target i686-pc-windows-msvc --locked --release
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Windows Build
           path: |
@@ -39,8 +39,8 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     env:
-      BYOND_MAJOR: 514
-      BYOND_MINOR: 1585
+      BYOND_MAJOR: 515
+      BYOND_MINOR: 1636
       PKG_CONFIG_ALLOW_CROSS: 1
 
     steps:
@@ -72,7 +72,7 @@ jobs:
       - name: Build (release) (default features)
         run: cargo build --target i686-unknown-linux-gnu --locked --release
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Linux Build
           path: |