forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into vulpes
- Loading branch information
Showing
652 changed files
with
26,417 additions
and
10,512 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 |
|---|---|---|
|
|
@@ -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 |
|---|---|---|
|
|
@@ -28,8 +28,8 @@ jobs: | |
| - 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 | ||
|
|
||
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
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.