Commit graph

285 commits

Author SHA1 Message Date
Morb0
6324b0fb8e Fix forced manifest instead of ACZ for public build 2023-12-26 14:54:24 +03:00
Morb0
57d9600428 Disable publish Discord changelogs workflow 2023-12-21 03:54:50 +03:00
Morb0
7d4b894002 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
2023-12-16 03:05:40 +03:00
Pieter-Jan Briers
d0e77303dd
.NET 8 compatibility (#22461) 2023-12-15 18:19:48 +01:00
Leon Friedrich
b8e3cdfb7e
Remove myself from codeowners (too many notifications) (#22504) 2023-12-15 08:05:44 +11:00
Morb0
6b2c649308 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Resources/Textures/Tiles/attributions.yml
2023-12-10 10:43:49 +03:00
Morb0
57ed7f3b7b Make public build using Hybrid ACZ mode 2023-12-09 14:52:03 +03:00
Vasilis
d4490f7035
Fixed credits action failing (#21733) 2023-12-09 13:15:38 +11:00
lzk
6cb14b8652
Delete toolshed-feature-request.md (#1615) 2023-12-08 16:35:24 +03:00
Arthur Asimov
52ddb407df Uncomment Discord changelog workflow 2023-12-07 16:09:35 +03:00
mhamster
6702ec9832
[Wiki] MealRecipes json generator (#1566) 2023-11-21 17:16:03 +03:00
Morb0
1116bda1a1 Fix publish public workflow 2023-11-17 00:26:56 +03:00
Morb0
611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Packaging/ContentPackaging.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Resources/Audio/Weapons/Guns/Gunshots/license.txt
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
Morb0
7e06ecda8b Change update publish to 6:00 UTC 2023-11-07 02:14:53 +03:00
metalgearsloth
b9c38879e5
Port python packaging to Content.Packaging (#21458) 2023-11-07 09:53:59 +11:00
Morb0
7426f258c3 Revert "Use ssh-agent for publish workflow"
This reverts commit 945ae46b70.
2023-10-23 10:57:38 +03:00
Morb0
945ae46b70 Use ssh-agent for publish workflow 2023-10-20 12:05:07 +03:00
Morb0
03860be233 Use Github FORK_ID in workflow 2023-10-16 03:52:19 +03:00
Morb0
75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Communications/CommunicationsConsoleSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
Vasilis
eb833335d9
Github actions script to update ingame credits for contributors (#20345) 2023-10-09 16:42:53 -07:00
Morb0
abf8abe1eb Remove build info generation for public build 2023-10-07 14:48:10 +03:00
Morb0
1c1fa21f95 Fix GH vars use 2023-10-07 14:18:00 +03:00
Morb0
59bbfe7615 Use ACZ for public builds 2023-10-07 14:14:46 +03:00
Morb0
3ebd054bce Revert "Disable manifest download for public build"
This reverts commit ea9bf2e146.
2023-10-07 14:14:23 +03:00
Morb0
ea9bf2e146 Disable manifest download for public build 2023-10-07 13:59:46 +03:00
Morb0
5ca1a75d49 Use workflow vars FORK_ID & default fork_id in script 2023-10-05 17:19:05 +03:00
Morb0
a88c257139 Take fork_id from workflow env 2023-10-03 19:13:11 +03:00
Morb0
8fa4553bdf Use cp instead of ln for publish workflow 2023-10-03 15:04:17 +03:00
Morb0
05f2b1fd81 just directly call ln in publish workflow 2023-10-03 14:40:27 +03:00
Morb0
c144a9ee75 Fix setup_secrets.sh 2023-10-03 14:34:04 +03:00
Morb0
23b3f8e4e9 chmod setup_secrets script 2023-10-03 14:32:17 +03:00
Morb0
718bf6ceba Fix sh setup_secret script call 2023-10-03 14:28:55 +03:00
Morb0
27e5c1d8f5 Add sh setup secrets script 2023-10-03 14:24:25 +03:00
Morb0
95f43aa02a Fix publish workflow jobs order 2023-10-03 14:13:12 +03:00
Morb0
9782fa644e Run setup secrets ps1 in publish workflow 2023-10-03 14:09:34 +03:00
Morb0
eabed92967 Hotfix public publish workflow job 2023-10-03 13:02:17 +03:00
Morb
b65eee1b06
Public build publish workflow (#1481) 2023-10-03 12:38:47 +03:00
Morb0
34a8740819 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/build-test-release.yml
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
2023-10-02 02:18:19 +03:00
DrSmugleaf
90404450d4
Remove windows-latest CI runs, remove unused build-test-release.yml (#20540) 2023-09-28 15:46:26 -07:00
Morb
cbb445e822
Update wiki workflow (#1452) 2023-09-24 18:13:46 +03:00
Morb
0d92ed8a3a
Revert "Remove old wiki update workflow (#20385)" (#1450) 2023-09-24 17:42:08 +03:00
Morb0
13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/update-wiki.yml
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/manifest.yml
2023-09-24 12:56:24 +03:00
Kevin Zheng
f6d07b6b2e
Remove old wiki update workflow (#20385) 2023-09-22 14:54:50 -05:00
Jezithyr
31b2c9f830
Refactoring body system to use containers and general body cleanup (#20202)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-21 17:23:02 +10:00
Kevin Zheng
55f51a3fc5
Update CODEOWNERS (#19835) 2023-09-04 20:29:24 -04:00
Moony
4c965986a2
Update my CODEOWNERS entries (#19776) 2023-09-03 10:23:19 -04:00
Kara
8102f89fc3
remove my codeowners (#19775) 2023-09-02 21:51:23 -07:00
Nemanja
3368e1c778
Remove remie and Paul from CODEOWNERS (#19732) 2023-09-01 13:36:41 -06:00
Morb0
1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
DrSmugleaf
d1eea3f6f6
Update CI to use .NET 7.0.x, setup-dotnet 3.2.0, checkout 3.6.0 (#19552) 2023-08-25 15:33:01 -07:00