Commit Graph

75 Commits

Author SHA1 Message Date
ike709 640e2dac89
Stop labeling draft PRs with merge conflicts (#9089) 2022-06-23 18:25:34 -07:00
wrexbe 81e3b2da88
Make tests faster (#8737)
* Test changes

* Make finding the test tile a little smarter
2022-06-19 20:22:28 -07:00
ike709 381bcf7c91
Don't flag merge conflicts on draft PRs (#8821) 2022-06-14 17:20:27 +10:00
ike709 1af683ee90
Revert "Remove merge conflict comment" (#8820) 2022-06-13 18:45:23 +02:00
wrexbe a39233c6ff
Remove merge conflict comment (#8819) 2022-06-13 08:03:00 -07:00
Moony ab1b37ebbf
Add a merge conflict check. (#8626)
* Add a merge conflict check.

This is directly copied from https://github.com/wixoaGit/OpenDream/pull/648

* Update .github/workflows/conflict-labeler.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

Co-authored-by: ike709 <ike709@users.noreply.github.com>
2022-06-04 20:34:48 -07:00
wrexbe 040d1c3aa4
Fix debug tests with engine change (#8609) 2022-06-03 02:53:57 -07:00
DrSmugleaf f98ac77179
More github action tests (#7301) 2022-05-30 19:52:27 -07:00
wrexbe c4880d80d5
Fix github action test output spam (#8316) 2022-05-20 18:16:05 -07:00
Paul Ritter 6ec5af5582
workflow (#7987) 2022-05-07 13:17:55 +02:00
Vera Aguilera Puerto e1eea793ea Allow publish workflow to be manually dispatched.
Will help in situations where we need to push a hotfix so people can continue playing the game normally.
2022-04-03 13:29:45 +02:00
Paul Ritter f2d6fba6eb
point-release 2022-04-02 20:30:36 +02:00
Zoldorf c6517abea1
Update build-docfx.yml 2022-03-23 17:31:21 -06:00
Zoldorf 1a6d2632cf
Update build-test.yml 2022-03-22 17:29:43 -06:00
Zoldorf 8a7b9b1597
Update update-wiki.yml 2022-03-22 17:28:22 -06:00
Zoldorf 693669d9ec
Create build-docfx.yml 2022-03-21 17:25:21 -06:00
Zoldorf 5ecea909bc
:mistake: 2022-03-21 17:24:35 -06:00
Zoldorf 3b1b66b68a
Update build-test.yml 2022-03-21 15:54:01 -06:00
Zoldorf 9c8cfa9574
Update build-test.yml 2022-03-21 15:49:23 -06:00
Kara D d36b35fb9f
ok fine 2022-03-12 19:00:25 -07:00
Kara D b614daf396
Update the .NET version for build-test workflow
This should hopefully make it catch CS8983 so we stop getting angry people on VS2022
2022-03-12 18:55:42 -07:00
Kara D eedaedc4fd
probably fix build-test not running on submodule update 2022-01-21 10:50:17 -07:00
Sam Weaver adddd2fac6
FIXED: Chemistry JSON dump tool and companion GitHub Action (#6222)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-18 14:44:22 -07:00
Moony 5fd45fc82a
Revert "Chemistry JSON dump tool and companion GitHub Action (#6134)" (#6217)
This reverts commit 40e2e78e0f.
2022-01-17 16:06:19 -06:00
Sam Weaver 40e2e78e0f
Chemistry JSON dump tool and companion GitHub Action (#6134)
* fuck

* oh boy

* Sorted every chem into guide groups

* WHY ARE YOU NOT ABSTRACT

* removes the target thing in favor of simply generating everything.

* eee

* Add group for med

* Update wiki JSON generation to use System.Text.Json

* Fix error on shutdown during wiki JSON generation

* First pass at automatic wiki workflow

* Add a temporary workaround while the build is continuing to give errors

* Update workflow to reference correct API url, track dependency.

* Compile wiki actions into one job rather than two

* Update page name to reference editable page

* Add other JSON file and parameterize root page path

* A few steps closer to using `System.Text.Json` to serialize properly

* Revert System.Text.Json and return to Newtonsoft.Json.

* Revert the revert. Return to System.Text.Json.

This reverts commit a5ea98dfdcfab3f605ac4d82d3b110f099324308.

* Add and register UniversalJsonConverter class.

* Narrow triggers for update-wiki GitHub action.

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-17 13:50:02 -06:00
mirrorcult 81fb52c041
Auto-labeling actions for pull requests (#6117) 2022-01-10 16:06:08 -07:00
Kara D 8a84d30b05
update RSI diff workflow to space-wizards fork 2022-01-08 15:34:20 -07:00
Pieter-Jan Briers b42412903b Don't allow concurrent publish actions.
If two commits gets pushed in quick succession, and the first takes much longer to publish (for some reason), said build can be considered "latest".

This just happened and it broke the servers.
2021-12-20 16:05:39 +01:00
Vera Aguilera Puerto 1860ad4b99 Publish master builds again 2021-12-11 16:15:07 +01:00
Paul 38990d4f95 stable branch publish 2021-12-05 20:34:31 +01:00
Pieter-Jan Briers 76a8f4d7da
Change location of builds
It's a symlink now, no I won't have to change this again when I'm done formatting the HDD.
2021-11-27 17:14:40 +01:00
Kara D 7da2879220
Probably avoids the empty RSI diff bug 2021-11-17 22:59:05 -07:00
Pieter-Jan Briers 6f2cc733e7
Fix publish workflow 2021-11-09 15:19:32 +01:00
Javier Guardia Fernández af579b15cc
Update to .NET 6 and C# 10 (#5233)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-11-09 15:05:07 +01:00
Kara D fbea5744e2
god bless Ana06
fixes rsi diff error on swept's massive PR
2021-10-09 13:15:08 -07:00
mirrorcult f1e56483a2
Only run workflows when necessary (#4790)
* Run workflows only when necessary

* submod

* also run tests on yml change

* aba bab abab ababa

* give up

* give up 2
2021-10-07 13:32:42 -07:00
Kara D f2618a4461
Fix rsi diff action
github moment, imagine caring about security
2021-10-06 21:59:30 -07:00
Kara D d622480d2f
Potential fix for RSI diff action 2021-10-06 21:20:06 -07:00
mirrorcult a44359bdf1
RSI Diff Bot (#4785) 2021-10-07 04:09:59 +00:00
Pieter-Jan Briers 64813d9c56 Oops that broke integration tests on Windows. 2021-06-21 02:29:54 +02:00
Pieter-Jan Briers 4a46fbe6dd Enable server GC for integration tests. 2021-06-21 02:09:57 +02:00
Swept 56dfd880b2
Update yaml-linter.yml 2021-05-04 03:58:17 +00:00
Swept 2fe3a8ea12
Update build-test.yml 2021-05-04 03:53:55 +00:00
DrSmugleaf 666fb9e2af
Make the YAML linter build step ignore nullable warnings
Now it will run even if there are nullable warnings.
2021-03-15 17:23:57 +01:00
ike709 25079ecab6
Improves RSI Validator (#3615)
* Improve the action

* Update

* Update .github/workflows/validate-rsis.yml

Co-authored-by: ike709 <sparebytes@protonmail.com>
2021-03-12 09:40:55 +01:00
DrSmugleaf 4f9bd4e802
Disable RSI validator on pushes
https://github.com/snapcart/json-schema-validator/issues/2
2021-03-10 14:46:11 +01:00
ike709 1f1b530870
Adds a GitHub Action to validate RSIs (#3587)
* Validate RSIs

* Fix the JSON

* Example invalid RSI

* Revert "Example invalid RSI"

This reverts commit 1905bc9d2c275818db88cd8b643e2646f70b68a1.

* Fixes an invalid identifier to show that it works on valid RSIs

* Update .github/workflows/validate-rsis.yml
2021-03-09 20:51:37 +01:00
DrSmugleaf 892bd7acb1 Remove nowarn from yaml linter action 2021-03-05 02:38:09 +01:00
Paul Ritter 5c50b1f6ed
Serialization v3 content PR (#3491)
* serv3 in shared pt 1

* beginning of deepclone api

* progress in implementing ideepclone & serv3 in content

* adds target

* its cant hurt you it cant hurt you

* more changes to content.server

* adds dataclasses

* almost there

* renamed & edited entry

* finishes refactoring content to use serv3

* gasmixture runtimes, next: reagentunit

* fucin hell that was an annoying one

* adds flags

* fixes some yaml errors

* removes comment

* fixes generic components for now

* removes todo
actually clones values my god paul
fixes bug involving resolving custom data classes from other proj
renames dataclass
fixes spritecomp
adds WithFormat.Constants support

* adds deepclone to ResistanceSet

* adds a bunch of deepclone implementations
adds a deepclone analyzer (TODO)
adds a deep clone fallback for classes & structs

* fixes a bunch of runtimes

* adds deepclone to entityuid

* adds generator to sln

* gets rid of warnings

* fixes

* argh

* componentdata refactors

* more deepclone impl

* heck me i reworked all of content deepclone

* renames custom dataclasstarget

* misc

* reworks prototypes

* deepclone nuke

* renamed customdataclass attribute

* fixes everything

* misc fixed

* the killcommit

* getting there

* changed yamlfieldattribute namespace

* adds back iselfserialize

* renames everything to data(field/definition)

* ouch

* Fix most errors on content

* Fix more errors in content

* Fix some components

* work on tests

* fixes some customdataclasses

* fuggin shit

* yes

* yeas

* Remove data classes

* Data field naming fixes

* arg

* Git resetti RobustToolbox

* Merge fixes

* General fixes

* Fix startup serialization errors

* Fix DamageContainerPrototype when supported classes or types are null

* Implement construction graph step type serializer

* Fix up construction serialization

* Fix up construction serialization part 2

* Fix null list in technology database component

* Fix body serialization

* Fix entity storage serialization

* Fix actions serialization

* Fix AI serialization

* Fix reaction serialization

* Fix body serialization

* Fix grid atmosphere serialization

* Rename IServ3Manager to ISerializationManager

* Convert every non generic serializer to the new format, general fixes

* Serialization and body system fix

* pushinheritance fix

* Update all prototypes to have a parent and have consistent id/parent properties

* Merge fixes

* smh my head

* cuddling slaps

* Content commit for engine PR

* stuff

* more fixes

* argh

* yes even you are fixed

* changelog fixes

* fixes seeds

* argh

* Test fixes

* Add writing for alert order prototype

* Fix alert order writing

* FIX

* its been alot ok

* Fix the rest of the visualizers

* Fix server alerts component tests

* Fix alert prototype tests not using the read value

* Fix alert prototype tests initializing serialization multiple times

* THIS IS AN AMERICAN CODEBASE GOD BLESS THE USA

* Add ImplicitDataDefinitionForInheritors to IMechanismBehavior
Fixes the behaviors not being found

* Fix NRE in strap component
Good night to the 1 buckle optimization

* Fix clothing component slot flags serialization tag

* Fix body component in all components test

* Merge fixes

* ffs

* Make construction graph prototype use serialization hooks

* human yaml linted

* a

* Do the thing for construction

* stuff

* a

* monke see yaml linter

* LINT HARDER

* Remove redundant todo

* yes

* Add skip hook argument to readers and copiers

* we gamin

* test/datafield fixes

* adds more verbose validation

* moves linter to action

* Improve construction graph step type serializer error message

* Fix ammo box component NRE

* gamin

* some updates to the linter

* yes

* removes that test

* misc fixes

* array fix
priority fix
misc fixes

* adds proper info the validation

* adds alwaysrelevant usa

* Make yaml linter take half as long to run (~50% less)

* Make yaml linter 5 times faster (~80% less execution time)

* based vera being based

* fixes mapsaving

* warning cleanup & moves surpressor

* removes old msbuild targets

* Revert "Make yaml linter 5 times faster (~80% less execution time)"

This reverts commit 3e6091359a26252c3e98828199553de668031c63.

* Add -nowarn to yaml linter run configuration

* Improve yaml linter message feedback

* Make dependencies an argument instead of a property on the serialization manager

* yamllinting slaps

* Clean up type serializers

* Move yaml linter code to its own method

* Fix yaml errors

* Change yaml linter action name and remove -nowarn

* yaml linter please shut

* Git resetti robust toolbox

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-03-05 01:08:38 +01:00
Pieter-Jan Briers 9e148db8e4 Oops don't run publish on PRs. 2021-03-04 11:26:51 +01:00