Skip to content

Commit

Permalink
Add ship tests and extra tests fixups (#2170)
Browse files Browse the repository at this point in the history
* Fixup all tests except integration and add the ship one

* GitHub credits

* update-credits repo comment

* Remove my dupe, restore GITHUB_TOKEN

* ATC email consistency

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
  • Loading branch information
dvir001 and whatston3 authored Oct 8, 2024
1 parent cb0aeb1 commit 90ec949
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-map-renderer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build:
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
strategy:
matrix:
os: [ubuntu-latest]
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/build-test-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ on:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]
branches: [ master ]
pull_request_target: # Frontier: only run tests on C# changes
paths: # Frontier
- "**/*.cs" # Frontier

jobs:
build:
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
strategy:
matrix:
os: [ubuntu-latest]
Expand Down Expand Up @@ -46,6 +49,12 @@ jobs:

- name: Run Content.Tests
run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0

# - name: Run Content.IntegrationTests
# shell: pwsh
# run: |
# $env:DOTNET_gcServer=1
# dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
ci-success:
name: Build & Test Debug
needs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conflict-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
Label:
if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' )
if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) && ( github.actor != 'FrontierATC' ) # Frontier
runs-on: ubuntu-latest
steps:
- name: Check for Merge Conflicts
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/labeler-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Labels: PR"

on:
- pull_request_target

jobs:
labeler:
if: github.actor != 'PJBot' && github.actor != 'FrontierATC' # Frontier
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
File renamed without changes.
24 changes: 0 additions & 24 deletions .github/workflows/pr-labeler.yml

This file was deleted.

37 changes: 12 additions & 25 deletions .github/workflows/update-credits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ on:
workflow_dispatch:
schedule:
- cron: 0 0 * * 0

jobs:
get_credits:
runs-on: ubuntu-latest
# Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
# Do this in dump_github_contributors.ps1 too into your own repo
if: github.repository == 'space-wizards/space-station-14'
if: github.repository == 'new-frontiers-14/frontier-station-14' # Frontier: space-wizards/space-station-14<new-frontiers-14/frontier-station-14

steps:
- uses: actions/checkout@v3.6.0
with:
ref: master

- name: Get this week's Contributors
shell: pwsh
env:
Expand All @@ -25,30 +25,17 @@ jobs:

# TODO
#- name: Get this week's Patreons
# run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml
# run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml

# MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL


# For this you can use a pat token of an account with direct push access to the repo if you have protected branches.
# For this you can use a pat token of an account with direct push access to the repo if you have protected branches.
# Uncomment this and comment the other line if you do this.
# https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches

#- name: Commit new credit files
# uses: stefanzweifel/git-auto-commit-action@v4
# with:
# commit_message: Update Credits
# commit_author: PJBot <pieterjan.briers+bot@gmail.com>

# This will make a PR
- name: Set current date as env variable
run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5

- name: Commit new credit files
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit-message: Update Credits
title: Update Credits
body: This is an automated Pull Request. This PR updates the github contributors in the credits section.
author: PJBot <pieterjan.briers+bot@gmail.com>
branch: automated/credits-${{env.NOW}}
commit_message: Update Credits
commit_author: FrontierATC <zuuswa@gmail.com>
2 changes: 1 addition & 1 deletion .github/workflows/validate-rgas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
yaml-schema-validation:
name: YAML RGA schema validator
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.6.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate_mapfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
yaml-schema-validation:
name: YAML map schema validator
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.6.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
name: YAML Linter
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.6.0
Expand Down
2 changes: 1 addition & 1 deletion Resources/Credits/GitHub.txt

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Resources/Locale/en-US/credits/credits-window.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ credits-window-licenses-tab = Open Source Licenses
credits-window-become-patron-button = Become a Patron
credits-window-contributor-encouragement-label = Want to get on this list?
credits-window-contribute-button = Contribute!
credits-window-contributors-section-title = Space Station 14 Contributors
# Frontier: "Space Station 14"<"Frontier Station"
credits-window-contributors-section-title = Frontier Station Contributors
credits-window-codebases-section-title = Space Station 13 Codebases
credits-window-original-remake-team-section-title = Original Space Station 13 Remake Team
credits-window-special-thanks-section-title = Special Thanks
2 changes: 2 additions & 0 deletions Tools/contribs_shared.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ $ignore = @{
"paul" = $true # erroneously included -- presumably from PaulRitter, somehow, who is already credited
"08a" = $true # erroneously included -- valid github account, but not an actual contributor, probably an alias of a contributor who does not own this github account and is already credited somewhere.
"UristMcContributor" = $true # this was an account used to demonstrate how to create a valid PR, and is in actuality Willhelm53, who is already credited.
"FrontierATC" = $true # Frontier
"whatstone" = $true # Frontier: duped
}

$add = @("RamZ")
2 changes: 1 addition & 1 deletion Tools/dump_github_contributors.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function load_contribs([string] $repo)
}

$engineJson = load_contribs("space-wizards/RobustToolbox")
$contentJson = load_contribs("space-wizards/space-station-14")
$contentJson = load_contribs("new-frontiers-14/frontier-station-14") # Frontier: space-wizards/space-station-14<new-frontiers-14/frontier-station-14

($engineJson).login + ($contentJson).login + ($add) `
| select -unique `
Expand Down

0 comments on commit 90ec949

Please sign in to comment.