Morb0
|
8ffde2eea4
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# .github/workflows/test-packaging.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
# Tools/gen_build_info.py
|
2024-07-14 12:15:16 +03:00 |
|
Pieter-Jan Briers
|
c1915c9d73
|
Remove outdated steps from Test Packaging workflow (#30018)
gen build info was removed in 5e800e0ece but I didn't realize this workflow also tested it. Gone now.
|
2024-07-13 22:36:20 +02: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 |
|
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 |
|
metalgearsloth
|
b9c38879e5
|
Port python packaging to Content.Packaging (#21458)
|
2023-11-07 09:53:59 +11:00 |
|
Morb0
|
1c1fa21f95
|
Fix GH vars use
|
2023-10-07 14:18:00 +03:00 |
|
Morb0
|
5ca1a75d49
|
Use workflow vars FORK_ID & default fork_id in script
|
2023-10-05 17:19:05 +03: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 |
|
Morbo
|
60dd232b44
|
Ignore IanComradeBot in workflows
|
2023-04-04 15:40:13 +03:00 |
|
Morbo
|
82a466f4ff
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Resources/Audio/Announcements/license.txt
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
|
2023-03-07 18:54:29 +03:00 |
|
Moony
|
028fa395d8
|
fix bors config (#14389)
i did an oops
|
2023-03-04 23:56:55 +00:00 |
|
Moony
|
7232bf4ba4
|
Configure and enable bors (#14383)
* Update build-test-debug.yml
* Update build-test-release.yml
* Update test-packaging.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update validate-rsis.yml
* Update validate-rgas.yml
* Create bors.toml
|
2023-03-03 22:55:05 -06:00 |
|
Morb
|
fdfafd06e7
|
Add evil twin + Secrets (#823)
|
2023-02-18 23:49:55 -08:00 |
|
Moony
|
202680ac56
|
Enable merge group checks for our workflows. (#14005)
* Enable merge group checks for our workflows.
* Update build-test-release.yml
* Update validate-rgas.yml
* Update validate-rsis.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update test-packaging.yml
|
2023-02-09 16:35:34 +00:00 |
|
metalgearsloth
|
0e8b8c0735
|
Don't run gh actions on draft prs (#13706)
|
2023-01-26 14:37:28 -08:00 |
|
metalgearsloth
|
033e87aa3b
|
Don't run CI For PJBot (#13188)
I have no idea what I'm doing
|
2022-12-26 17:37:57 -06:00 |
|
0x6273
|
8c52dac3f3
|
Update setup-dotnet in gh actions (#12261)
|
2022-10-30 12:05:51 -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 |
|