tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,029 Commits 3 Branches 5 Tags
cba8ff270c901b6786980a0d16a0f0ccddae93f9
Commit Graph

105 Commits

Author SHA1 Message Date
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
Jacob Tong
09ae27f492 Update issue template (#8218) 2022-05-16 13:08:27 -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
DrSmugleaf
19d8824951 Add myself to CODEOWNERS 2022-03-26 15:45:35 +01:00
Pieter-Jan Briers
5954b7668c Update my codeowners (#7287) 2022-03-26 12:46:21 +01: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
ElectroJr
1714d6d8c3 CODEOWNERS update 2022-03-19 23:52:50 +13:00
DrSmugleaf
3b54fe1092 Add myself to CODEOWNERS 2022-03-19 11:27:05 +01: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
ike709
0349c843e3 Adds support for CC-BY-NC licenses (#6648) 2022-02-10 20:27:48 -07:00
ElectroJr
86fb89edb8 update codeowners & tiny door bugfix 2022-02-01 13:39:33 +13: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
Moony
9aed658f83 Paul, codeowner entries apply only once 
@PaulRitter you accidentally overrode my CODEOWNERS entry.
 2022-01-13 22:29:09 -06:00
Paul Ritter
92d15bb25e Update CODEOWNERS 2022-01-12 23:18:11 +01:00
Paul Ritter
bda5f0f19c forgot a tidbid 2022-01-12 23:02:41 +01:00
Paul Ritter
5c74df9302 add myself to codeowners 2022-01-12 22:43:00 +01:00
ElectroJr
a666da6797 Taking responsibility for my mistakes (codeowners) 2022-01-11 15:44:53 +13:00
mirrorcult
81fb52c041 Auto-labeling actions for pull requests (#6117) 2022-01-10 16:06:08 -07:00
Kara D
4be7c4a63e commit farmer 2022-01-09 15:06:49 -07:00
Kara D
268e3e3baf codeowners myself 2022-01-09 14:23:39 -07:00
Vera Aguilera Puerto
809ccef6fb Add new entries to CODEOWNERS for myself. 
I won't get pinged for every single PR ever again, yay
 2022-01-09 19:26:53 +01:00
Moony
2dfdb99a4a Move the vera/pjb fallback entry to the top. 2022-01-09 10:34:01 -06:00
Moony
3fd9b8efb7 Update CODEOWNERS 2022-01-08 23:10:03 -06:00
Moony
a3e73889b2 Adds myself as codeowner for various administration things. (#5592) 2022-01-08 16:52:03 -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