forked from yogstation13/Yogstation
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into corporations-tweaks
- Loading branch information
Showing
2,523 changed files
with
478,738 additions
and
38,085 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Oops, something went wrong.