Arthur
e4ffbc56e9
Try remove only one label on approve
2022-07-31 21:11:52 +03:00
Arthur
df603cc904
Return Github wiki WIKI_PAGE_ROOT
2022-07-29 23:50:24 +03:00
Arthur
3474f82f03
Use Github secrets for wiki upload workflow
2022-07-29 20:42:29 +03:00
Arthur
783a47a95c
Use rsync to ignore duplicate uploads & move server info to secrets
2022-07-17 05:08:10 +03:00
Arthur
a1dac73500
Fix approve labeler workflow
2022-07-02 22:30:13 +03:00
Arthur
a5fa8904ec
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
2022-06-24 04:58:34 +03:00
ike709
640e2dac89
Stop labeling draft PRs with merge conflicts ( #9089 )
2022-06-23 18:25:34 -07:00
Arthur
49afa5c89e
Add workflow to remove statuses after approve
2022-06-23 15:33:16 +03: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
Arthur
5b9ec5ce3e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Interaction/SharedInteractionSystem.cs
2022-06-18 07:08:37 +03: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
Arthur
5e78fb6fff
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-06-06 04:32:53 +03: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
Arthur
fee8678a41
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Prototypes/Maps/game.yml
2022-06-04 03:08:27 +03: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
Arthur
78c140e58b
Remove submodule update check workflow
2022-05-25 03:13:34 +03:00
Arthur
5aeb1ed4b8
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-05-25 02:29:09 +03:00
wrexbe
c4880d80d5
Fix github action test output spam ( #8316 )
2022-05-20 18:16:05 -07:00
Arthur
75c6f4d42f
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-05-07 21:32:57 +03:00
Paul Ritter
6ec5af5582
workflow ( #7987 )
2022-05-07 13:17:55 +02:00
Arthur
f8f6c9d1bf
Enable auto publishing
2022-04-24 14:15:22 +03:00
Arthur
c5d52eb3be
Temporary disable auto publish
2022-04-19 13:42:21 +03:00
Arthur
61d0c1889f
Update publish workflow
2022-04-18 21:09:57 +03:00
Arthur
237bb2dd2b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
2022-04-06 07:11:02 +03: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
Morbo
ea305fedd7
Remove docfx ( #162 )
2022-03-26 03:30:37 +03:00
Zoldorf
c6517abea1
Update build-docfx.yml
2022-03-23 17:31:21 -06:00
Arthur
19502de5f4
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-03-23 21:26:58 +03: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
Arthur
c4e6cdfbbd
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-03-22 04:48:30 +03: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
Arthur
fb4739aeab
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/species.yml
# Resources/Server Info/Rules.txt
# Resources/Textures/Tiles/dark.png
# Resources/Textures/Tiles/steel.png
# Resources/Textures/Tiles/white.png
2022-03-13 21:51:12 +03: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
Morbo
825836d5a5
Fix GitHub action wiki url ( #81 )
2022-01-24 09:09:11 +03:00
Morbo
fcc4273fae
Update GitHub action wiki url ( #80 )
2022-01-24 07:23:57 +03:00
Arthur
cda6bb26f1
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-01-22 22:07:12 +03:00
Kara D
eedaedc4fd
probably fix build-test not running on submodule update
2022-01-21 10:50:17 -07:00
Arthur
9f475b7972
Merge remote-tracking branch 'upstream/master' into upstream
2022-01-19 00:57:01 +03: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
