forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into MedP_surgery_fail
- Loading branch information
Showing
1,835 changed files
with
55,843 additions
and
15,508 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| name: Bug Report | ||
| description: Create a report to help reproduce and fix the issue. | ||
| body: | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| # **Please read the following guidelines. Follow all instructions or else your issue is subject to closure.** | ||
| ## If you use the "Report Issue" button in the top-right corner of the game, it will automatically fill in some of the information below. | ||
| If you are reporting an issue found in another branch or codebase, you _must_ link the branch or codebase repo in your issue report or it will be closed. | ||
| For branches, If you have not pushed your code up, please either reproduce it on master or push your code up before making an issue report. | ||
| For other codebases, if you do not have a public code repository you will be refused help unless you can completely reproduce the issue on our master branch. | ||
| - type: input | ||
| id: reporting-version | ||
| attributes: | ||
| label: "Client Version:" | ||
| description: | | ||
| The BYOND version you are using to report this issue. You can find this information in the bottom left corner of the "About BYOND" window in the BYOND client. | ||
| It is strongly recommended that you include this, especially for concerns on the visual aspects of the game. | ||
| placeholder: "xxx.xxxx" | ||
| validations: | ||
| required: false | ||
| - type: textarea | ||
| id: issue-summary | ||
| attributes: | ||
| label: "Issue Summary:" | ||
| description: | | ||
| Briefly explain your issue in a few plain sentences. You may copy and paste the issue title here if it is suitable. | ||
| placeholder: | | ||
| "When I do X, Y happens instead of Z." | ||
| "X on Y map has Z issue." | ||
| validations: | ||
| required: true | ||
| - type: input | ||
| id: round-id | ||
| attributes: | ||
| label: "Round ID:" | ||
| description: | | ||
| If you discovered this issue from playing tgstation hosted servers, the Round ID can be found in the Status panel or retrieved from https://statbus.space/ | ||
| The Round ID lets us look up valuable information and logs for the round the bug happened. Leave this blank if there is no round ID. | ||
| placeholder: "XXXXXX" | ||
| validations: | ||
| required: false | ||
| - type: textarea | ||
| id: test-merges | ||
| attributes: | ||
| label: "Test Merge Information:" | ||
| description: | | ||
| If you're certain the issue is to be caused by a test merge [OOC Tab -> Show Server Revision], report it in the pull request's comment section rather than on the tracker. | ||
| If you're unsure you can refer to the issue number by prefixing said number with #. The issue number can be found beside the title after submission of this form. | ||
| validations: | ||
| required: false | ||
| - type: textarea | ||
| id: reproduction | ||
| attributes: | ||
| label: "Reproduction Steps:" | ||
| description: | | ||
| Describe the steps to reproduce the issue in detail. Include any relevant information, such as the map, round type, and any other factors that may be relevant. | ||
| If it is a runtime-related error, please include the runtime here as that is pertient information. Issues are not for oddities introduced by admin varedits, ensure these occur in normal circumstances. | ||
| placeholder: | | ||
| 1. Go to the X location | ||
| 2. Do Y action | ||
| 3. Observe Z result | ||
| validations: | ||
| required: true |
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 |
|---|---|---|
|
|
@@ -23,3 +23,4 @@ reset_label = "GBP: Reset" | |
| "Sound" = 3 | ||
| "Sprites" = 3 | ||
| "Unit Tests" = 6 | ||
| "Wallening Revert Recovery" = 10 | ||
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 |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ jobs: | |
| run: | | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "SS220Manager" | ||
| git config --local merge.conflictStyle zdiff3 | ||
| - name: Try merging | ||
| continue-on-error: true | ||
| run: | | ||
|
|
@@ -28,26 +29,55 @@ jobs: | |
| { | ||
| echo "MERGE_CONFLICTS<<EOF" | ||
| git diff --name-only --diff-filter=U | while read file; do | ||
| echo "- $file" | ||
| echo "<details>" | ||
| echo "<summary>$file</summary>" | ||
| echo -e "\n\`\`\`diff" | ||
| git diff --diff-filter=U "$file" | sed -n '/<<<<<<</,/>>>>>>>/p' | ||
| echo -e "\n\`\`\`" | ||
| echo "</details>" | ||
| done | ||
| echo EOF | ||
| } >> $GITHUB_ENV | ||
| - name: Run script | ||
| uses: actions/github-script@v7 | ||
| with: | ||
| script: | | ||
| const { MERGE_CONFLICTS } = process.env | ||
| if(!MERGE_CONFLICTS) { | ||
| return | ||
| } | ||
| await github.rest.issues.createComment({ | ||
| issue_number: context.issue.number, | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| body: `This pr causes following conflicts on translate branch:\n ${MERGE_CONFLICTS} ` | ||
| }) | ||
| const { MERGE_CONFLICTS } = process.env; | ||
| const conflict_message_header = "This PR causes following conflicts on translate branch:\n"; | ||
| const issue_body = `${conflict_message_header}${MERGE_CONFLICTS}`; | ||
| const comments = await github.rest.issues.listComments({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| issue_number: context.issue.number, | ||
| }); | ||
| const action_comment = comments.data.find(comment => comment.body.startsWith(conflict_message_header) && comment.user.login === "github-actions[bot]"); | ||
| if (action_comment) { | ||
| const comment_id = action_comment.id; | ||
| if (!MERGE_CONFLICTS) { | ||
| await github.rest.issues.deleteComment({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| comment_id: comment_id, | ||
| }); | ||
| return; | ||
| } | ||
| await github.rest.issues.updateComment({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| comment_id: comment_id, | ||
| body: issue_body, | ||
| }); | ||
| } else if (MERGE_CONFLICTS) { | ||
| await github.rest.issues.createComment({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| issue_number: context.issue.number, | ||
| body: issue_body, | ||
| }); | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -21,15 +21,16 @@ jobs: | |
| - name: Apply DMAPI update | ||
| uses: tgstation/tgs-dmapi-updater@v2 | ||
| id: dmapi-update | ||
| with: | ||
| header-path: 'code/__DEFINES/tgs.dm' | ||
| library-path: 'code/modules/tgs' | ||
|
|
||
| - name: Commit and Push | ||
| continue-on-error: true | ||
| run: | | ||
| git config user.name tgstation-server | ||
| git config user.email [email protected] | ||
| git config user.name "tgstation-server-ci[bot]" | ||
| git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com" | ||
| git add . | ||
| git commit -m 'Update TGS DMAPI' | ||
| git push -f -u origin tgs-dmapi-update | ||
|
|
@@ -41,7 +42,7 @@ jobs: | |
| source_branch: "tgs-dmapi-update" | ||
| destination_branch: "master" | ||
| pr_title: "Automatic TGS DMAPI Update" | ||
| pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging." | ||
| pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging.\n\n${{ steps.dmapi-update.outputs.release-notes }}" | ||
| pr_label: "Tools" | ||
| pr_allow_empty: false | ||
| github_token: ${{ secrets.COMFY_ORANGE_PAT }} | ||
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
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
Oops, something went wrong.