Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
Browse files Browse the repository at this point in the history
…to legion-rework
  • Loading branch information
FalloutFalcon committed Dec 18, 2023
2 parents d30f63b + 1a9faa1 commit 204ecd8
Show file tree
Hide file tree
Showing 279 changed files with 14,809 additions and 9,102 deletions.
56 changes: 37 additions & 19 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -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/**"
12 changes: 12 additions & 0 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,19 @@ jobs:
run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Integration Tests
strategy:
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]')"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/run_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
minor:
required: false
type: string
arg:
required: false
default: ALL_TESTS
type: string
jobs:
run_integration_tests:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -54,7 +58,7 @@ jobs:
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -D${{ inputs.arg }}
- name: Run Tests
run: |
source $HOME/BYOND/byond/bin/byondsetup
Expand Down
Loading

0 comments on commit 204ecd8

Please sign in to comment.