Merge remote-tracking branch 'upstream/master' into updates-deps-again

.github/labeler.yml

@@ -1,49 +1,67 @@
 Admin:
-  - "code/modules/admin/**"
+  - any-glob-to-any-file:
+    - "code/modules/admin/**"
 
 # Any file within the config subfolder
 Config:
-  - "config/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "config/**"
 
 Dependencies:
-  - "**/package.json"
-  - "**/package-lock.json"
-  - "**/yarn.lock"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/package.json"
+    - "**/package-lock.json"
+    - "**/yarn.lock"
 
 # When the .DME is changed
 DME Edit:
-  - "./*.dme"
-  - "**/*.dme"
+- changed-files:
+  - any-glob-to-any-file:
+    - "./*.dme"
+    - "**/*.dme"
 
 # Any .dmi changes
 Sprites:
-  - "**/*.dmi"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dmi"
 
 # Changes to a .dm or anything in the code subfolder
 Code Change:
-  - "**/*.dm"
-  - "code/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dm"
+    - "code/**"
 
 # Changes to a .dmm or anything in the _map subfolder
 Map Change:
-  - "**/*.dmm"
-  - "_maps/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.dmm"
+    - "_maps/**"
 
 # Any changes to .ogg files are marked as sound
 Sound:
-  - "**/*.ogg"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.ogg"
 
 # Changes to the SQL subfolder
 SQL:
-  - "SQL/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "SQL/**"
 
 # Changes to the tgui subfolder
 tgui:
-  - "tgui/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - "tgui/**"
 
 # Changes to the .Github subfolder
 Github:
-  - ".github/**"
-
-Deprecated Modularization:
-  - "whitesands/**"
+- changed-files:
+  - any-glob-to-any-file:
+    - ".github/**"

.github/workflows/autowiki.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   autowiki:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: "Check for AUTOWIKI_USERNAME"
       id: secrets_set

.github/workflows/ci_suite.yml

@@ -11,6 +11,7 @@ on:
       - master
 jobs:
   run_linters:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
     runs-on: ubuntu-22.04
     steps:
@@ -67,8 +68,9 @@ jobs:
           cat check_regex_output.txt
 
   compile_all_maps:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Python setup
@@ -91,54 +93,34 @@ jobs:
           tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT
 
   run_all_tests:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
-    runs-on: ubuntu-20.04
     strategy:
-      fail-fast: false
-    services:
-      mysql:
-        image: mysql:latest
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup cache
-        id: cache-byond
-        uses: actions/cache@v3
-        with:
-          path: ~/BYOND
-          key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
-      - name: Install BYOND
-        if: steps.cache-byond.outputs.cache-hit != 'true'
-        run: bash tools/ci/install_byond.sh
-      - name: Setup database
-        run: |
-          sudo systemctl start mysql
-          mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
-          mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
-          mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
-          mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
-      - name: Install rust-g
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
-          bash tools/ci/install_rust_g.sh
-      - name: Install auxmos
-        run: |
-          bash tools/ci/install_auxmos.sh
-      - name: Compile Tests
-        run: |
-          bash tools/ci/install_byond.sh
-          source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
-      - name: Run Tests
-        run: |
-          source $HOME/BYOND/byond/bin/byondsetup
-          bash tools/ci/run_server.sh
+      fail-fast: true
+      matrix:
+        arg: [
+          "BASIC_TESTS",
+          "CREATE_AND_DESTROY_TEST",
+          "PLANET_GEN_TEST",
+          "RUIN_PLACEMENT_TEST",
+          "SHIP_PLACEMENT_TEST"
+        ]
+    uses: ./.github/workflows/run_integration_tests.yml
+    with:
+      arg: ${{ matrix.arg }}
+
+#  run_alternate_tests:
+#    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+#    name: Alternate Tests
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        major: [515]
+#        minor: [1614]
+#    uses: ./.github/workflows/run_integration_tests.yml
+#    with:
+#      major: ${{ matrix.major }}
+#      minor: ${{ matrix.minor }}
 
   test_windows:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"

.github/workflows/compile_changelogs.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   compile:
     name: "Compile changelogs"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: "Check for ACTION_ENABLER secret and pass it to output if it exists to be checked by later steps"
         id: value_holder

.github/workflows/docker_publish.yml

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

.github/workflows/generate_documentation.yml

@@ -21,7 +21,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Restore SpacemanDMM cache

.github/workflows/labeler.yml

@@ -18,7 +18,7 @@ jobs:
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
       - name: Apply labels based on changed files
         if: github.event_name != 'push'
-        uses: actions/labeler@main
+        uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

.github/workflows/make_changelogs.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   MakeCL:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - name: Checkout

.github/workflows/round_id_linker.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   link_rounds:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: shiptest-ss13/[email protected]
         with:

.github/workflows/run_integration_tests.yml

@@ -0,0 +1,65 @@
+# This is a reusable workflow to run integration tests.
+# This is run for every single map in ci_suite.yml. You might want to edit that instead.
+name: Run Integration Tests
+on:
+  workflow_call:
+    inputs:
+      major:
+        required: false
+        type: string
+      minor:
+        required: false
+        type: string
+      arg:
+        required: false
+        default: ALL_TESTS
+        type: string
+jobs:
+  run_integration_tests:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup cache
+        id: cache-byond
+        uses: actions/cache@v3
+        with:
+          path: ~/BYOND
+          key: ${{ runner.os }}-byond-cache-${{ hashFiles('Dockerfile') }}
+      - name: Setup database
+        run: |
+          sudo systemctl start mysql
+          mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
+          mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
+          mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
+          mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
+      - name: Install rust-g
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
+          bash tools/ci/install_rust_g.sh
+      - name: Install auxmos
+        run: |
+          bash tools/ci/install_auxmos.sh
+      - name: Configure version
+        if: ${{ inputs.major }}
+        run: |
+          echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
+          echo "BYOND_MINOR=${{ inputs.minor }}" >> $GITHUB_ENV
+      - name: Compile Tests
+        run: |
+          bash tools/ci/install_byond.sh
+          source $HOME/BYOND/byond/bin/byondsetup
+          tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -D${{ inputs.arg }}
+      - name: Run Tests
+        run: |
+          source $HOME/BYOND/byond/bin/byondsetup
+          bash tools/ci/run_server.sh

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   stale:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/stale@v4

.github/workflows/tgs_test.yml

@@ -35,7 +35,7 @@ env:
   PR_NUMBER: ${{ github.event.number }}
 jobs:
   test_tgs_docker:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Test TGS Docker
     runs-on: ubuntu-22.04
     concurrency:
@@ -47,7 +47,7 @@ jobs:
         env:
           Database__DatabaseType: Sqlite
           Database__ConnectionString: Data Source=TGS_TGTest.sqlite3;Mode=ReadWriteCreate
-          General__ConfigVersion: 4.1.0
+          General__ConfigVersion: 5.0.0
           General__ApiPort: ${{ env.TGS_API_PORT }}
           General__SetupWizardMode: Never
         ports:
@@ -56,7 +56,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Checkout Repository
         uses: actions/checkout@v3

.github/workflows/update_tgs_dmapi.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   update-dmapi:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Update the TGS DMAPI
     steps:
       - name: Clone

.vscode/settings.json

@@ -17,14 +17,14 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.insertFinalNewline": true,
 	"gitlens.advanced.blame.customArguments": ["-w"],
 	"tgstationTestExplorer.project.resultsType": "json",
 	"[python]": {
 		"gitlens.codeLens.symbolScopes": ["!Module"],
-		"editor.wordBasedSuggestions": false,
+		"editor.wordBasedSuggestions": "off",
 		"editor.insertSpaces": true,
 		"editor.tabSize": 4
 	},