Skip to content

Commit

Permalink
Merge branch 'master' into corporations-tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCastmer authored Aug 25, 2024
2 parents 2327f93 + 1e0ec39 commit 9a654e2
Show file tree
Hide file tree
Showing 2,523 changed files with 478,738 additions and 38,085 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ code/__DEFINES/rust_g.dm eol=lf
## Enforce text mode and LF line breaks
*.bat text eol=lf
*.cjs text eol=lf
## *.css text eol=lf stop enforcing
## *.css text eol=lf stop enforcing, dripstation edit
*.dm text eol=lf
*.dme text eol=lf
*.dmf text eol=lf
Expand Down
21 changes: 20 additions & 1 deletion .github/workflows/turdis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,25 @@ jobs:
with:
outputFile: output-annotations.txt

odlint:
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: "Lint with OpenDream"
runs-on: ubuntu-22.04
concurrency:
group: odlint-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v4
- uses: robinraju/[email protected]
with:
repository: "OpenDreamProject/OpenDream"
tag: "latest"
fileName: "DMCompiler_linux-x64.tar.gz"
extract: true
- name: Run OpenDream
run: |
./DMCompiler_linux-x64/DMCompiler yogstation.dme --suppress-unimplemented --define=CIBUILDING
compile:
name: Compile All Maps
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -165,7 +184,7 @@ jobs:
- name: Compile
run: |
tools/build/build --ci dm -DCIBUILDING
tools/travis/dm.sh -DTRAVISBUILDING -DANSICOLORS yogstation.dme || travis_terminate 1
tools/travis/dm.sh -DCIBUILDING -DANSICOLORS yogstation.dme || travis_terminate 1
- name: Prepare Artifacts
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -222,3 +222,6 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
# ezdb
/db/
/config/ezdb.txt

# Running OpenDream locally
tgstation.json
24 changes: 12 additions & 12 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": false
}
]
}
"version": "0.2.0",
"configurations": [
{
"type": "byond",
"request": "launch",
"name": "Launch DreamDaemon",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
"dreamDaemon": true
}
]
}
10 changes: 10 additions & 0 deletions __odlint.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// This file is included right at the start of the DME.
// Its purpose is to enable multiple lints (pragmas) that are supported by OpenDream to better validate the codebase
// These are essentially nitpicks the DM compiler should pick up on but doesnt

#if !defined(SPACEMAN_DMM) && defined(OPENDREAM)
// This is in a separate file as a hack to avoid SpacemanDMM
// evaluating the #pragma lines, even if its outside a block it cares about
// (Also so people can code-own it. Shoutout to AA)
#include "tools/ci/od_lints.dm"
#endif
Loading

0 comments on commit 9a654e2

Please sign in to comment.