-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/master' into radial-pets
# Conflicts: # Resources/Locale/ru-RU/_strings/_sunrise/preferences/loadout-groups.ftl # Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml # Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml # Resources/Prototypes/ai_factions.yml
- Loading branch information
Showing
4,108 changed files
with
1,186,925 additions
and
842,480 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| name: Update Locale | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: read | ||
|
|
||
| jobs: | ||
| update-changelog: | ||
| runs-on: ubuntu-latest | ||
| if: github.repository == 'space-sunrise/space-station-14' | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up Python | ||
| if: steps.get_pr.outputs.PR_NUMBER != '' | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: '3.x' | ||
|
|
||
| - name: Install Dependencies | ||
| run: | | ||
| pip install pyyaml PyGithub pydash fluent | ||
| - name: Find Locale Keys | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| GITHUB_REPOSITORY: ${{ github.repository }} | ||
| run: | | ||
| python ./Tools/_sunrise/keyfinder.py | ||
| echo "Script exited with code $?" | ||
| - name: Update Yaml Locale Keys | ||
| run: | | ||
| python ./Tools/_sunrise/yamlextractor.py | ||
| echo "Script exited with code $?" | ||
| - name: Git status before commit | ||
| if: steps.get_pr.outputs.PR_NUMBER != '' | ||
| run: | | ||
| git status | ||
| - name: Commit and push changes | ||
| if: steps.get_pr.outputs.PR_NUMBER != '' | ||
| run: | | ||
| git config user.name "github-actions[bot]" | ||
| git config user.email "github-actions[bot]@users.noreply.github.com" | ||
| git add "Resources/Locale/*" | ||
| if git diff --cached --quiet; then | ||
| echo "No changes to commit." | ||
| else | ||
| git commit -m "Update locale [skip ci]" | ||
| git push origin HEAD:Starlight | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,62 @@ | ||
| # Sunrise-edit - no need, stupid test. | ||
| #name: Build & Test Debug | ||
| # | ||
| #on: | ||
| # push: | ||
| # branches: [ master, staging, trying ] | ||
| # merge_group: | ||
| # pull_request: | ||
| # types: [ opened, reopened, synchronize, ready_for_review ] | ||
| # branches: [ master ] | ||
| # | ||
| #jobs: | ||
| # build: | ||
| # if: github.actor != 'GayBot' && github.event.pull_request.draft == false | ||
| # strategy: | ||
| # matrix: | ||
| # os: [ubuntu-latest] | ||
| # | ||
| # runs-on: ${{ matrix.os }} | ||
| # | ||
| # steps: | ||
| # - name: Checkout Master | ||
| # uses: actions/[email protected] | ||
| # | ||
| # - name: Setup Submodule | ||
| # run: | | ||
| # git submodule update --init --recursive | ||
| # | ||
| # - name: Pull engine updates | ||
| # uses: space-wizards/[email protected] | ||
| # | ||
| # - name: Update Engine Submodules | ||
| # run: | | ||
| # cd RobustToolbox/ | ||
| # git submodule update --init --recursive | ||
| # | ||
| # - name: Setup .NET Core | ||
| # uses: actions/[email protected] | ||
| # with: | ||
| # dotnet-version: 8.0.x | ||
| # | ||
| # - name: Install dependencies | ||
| # run: dotnet restore | ||
| # | ||
| # - name: Build Project | ||
| # run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m | ||
| # | ||
| # - 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: | ||
| # - build | ||
| # runs-on: ubuntu-latest | ||
| # steps: | ||
| # - name: CI succeeded | ||
| # run: exit 0 | ||
| name: Build & Test Debug | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| merge_group: | ||
| pull_request: | ||
| types: [ opened, reopened, synchronize, ready_for_review ] | ||
| branches: [ master ] | ||
|
|
||
| jobs: | ||
| build: | ||
| if: github.actor != 'PJBot' && github.event.pull_request.draft == false | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
|
|
||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
| - name: Checkout Master | ||
| uses: actions/[email protected] | ||
|
|
||
| - name: Setup Submodule | ||
| run: | | ||
| git submodule update --init --recursive | ||
| - name: Pull engine updates | ||
| uses: space-wizards/[email protected] | ||
|
|
||
| - name: Update Engine Submodules | ||
| run: | | ||
| cd RobustToolbox/ | ||
| git submodule update --init --recursive | ||
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
| - name: Build Project | ||
| run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m | ||
|
|
||
| - 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: | ||
| - build | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: CI succeeded | ||
| run: exit 0 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: Check Merge Conflicts | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
| - synchronize | ||
| - reopened | ||
| - ready_for_review | ||
|
|
||
| jobs: | ||
| Label: | ||
| if: ( github.event.pull_request.draft == false ) && ( github.actor != 'GayBot' ) | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check for Merge Conflicts | ||
| uses: eps1lon/[email protected] | ||
| with: | ||
| dirtyLabel: "S: Merge Conflict" | ||
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | ||
| commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| name: "Labels: Approved" | ||
| on: | ||
| pull_request_review: | ||
| types: [submitted] | ||
| jobs: | ||
| add_label: | ||
| # Change the repository name after you've made sure the team name is correct for your fork! | ||
| if: ${{ (github.repository == 'space-wizards/space-station-14') && (github.event.review.state == 'APPROVED') }} | ||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: tspascoal/get-user-teams-membership@v3 | ||
| id: checkUserMember | ||
| with: | ||
| username: ${{ github.actor }} | ||
| team: "content-maintainers,junior-maintainers" | ||
| GITHUB_TOKEN: ${{ secrets.LABELER_PAT }} | ||
| - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'true' }} | ||
| uses: actions-ecosystem/action-add-labels@v1 | ||
| with: | ||
| labels: "S: Approved" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| name: "Labels: Size" | ||
| on: pull_request_target | ||
| jobs: | ||
| size-label: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: size-label | ||
| uses: "pascalgn/[email protected]" | ||
| env: | ||
| GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
| with: | ||
| # Custom size configuration | ||
| sizes: > | ||
| { | ||
| "0": "XS", | ||
| "10": "S", | ||
| "100": "M", | ||
| "1000": "L", | ||
| "5000": "XL" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| name: "Labels: Branch stable" | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
| branches: | ||
| - 'stable' | ||
|
|
||
| jobs: | ||
| add_label: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions-ecosystem/action-add-labels@v1 | ||
| with: | ||
| labels: "Branch: Stable" |
Oops, something went wrong.