forked from goonstation/goonstation
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
781 changed files
with
32,594 additions
and
19,801 deletions.
There are no files selected for viewing
Submodule +secret
updated
from abe7cc to c12c7e
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,40 @@ | ||
| name: merge_upstream | ||
| on: | ||
| issue_comment: | ||
| types: [ created ] | ||
| types: [created] | ||
|
|
||
| jobs: | ||
| merge-upstream: | ||
| if: ${{ github.event.issue.pull_request && github.event.comment.body == '!merge_upstream' }} | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: PR Data | ||
| run: | | ||
| curl -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }} > pr.json | ||
| echo "PR_REPO=`jq -r '.head.repo.full_name' < pr.json`" >> $GITHUB_ENV | ||
| echo "PR_BRANCH=`jq -r '.head.ref' < pr.json`" >> $GITHUB_ENV | ||
| - name: PR Data | ||
| run: | | ||
| curl -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }} > pr.json | ||
| echo "PR_REPO=`jq -r '.head.repo.full_name' < pr.json`" >> $GITHUB_ENV | ||
| echo "PR_BRANCH=`jq -r '.head.ref' < pr.json`" >> $GITHUB_ENV | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| repository: ${{ env.PR_REPO }} | ||
| ref: ${{ env.PR_BRANCH }} | ||
| fetch-depth: 0 | ||
|
|
||
| - uses: actions/checkout@v3 | ||
| with: | ||
| repository: ${{ env.PR_REPO }} | ||
| ref: ${{ env.PR_BRANCH }} | ||
| fetch-depth: 0 | ||
| - name: Perform Merge | ||
| run: | | ||
| bash tools/hooks/install.sh | ||
| bash tools/ci/install_build_tools.sh | ||
| bash tgui/bin/tgui --install-git-hooks | ||
| chmod +x tools/hooks/*.merge tgui/bin/tgui | ||
| git config user.name github-actions | ||
| git config user.email [email protected] | ||
| git remote add upstream "https://github.com/${{ github.repository }}.git" | ||
| git fetch upstream master | ||
| git merge upstream/master && git push origin | ||
| - name: Perform Merge | ||
| run: | | ||
| bash tools/hooks/install.sh | ||
| bash tools/ci/install_build_tools.sh | ||
| bash tgui/bin/tgui --install-git-hooks | ||
| chmod +x tools/hooks/*.merge tgui/bin/tgui | ||
| git config user.name github-actions | ||
| git config user.email [email protected] | ||
| git remote add upstream "https://github.com/${{ github.repository }}.git" | ||
| git fetch upstream master | ||
| git merge upstream/master && git push origin | ||
| - name: Notify Failure | ||
| if: failure() | ||
| run: | | ||
| curl -s -H "Authorization: token ${{ github.token }}" \ | ||
| -X POST -d '{"body": "Merging upstream failed:\nhttps://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"}' \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments" | ||
| - name: Notify Failure | ||
| if: failure() | ||
| run: | | ||
| curl -s -H "Authorization: token ${{ github.token }}" \ | ||
| -X POST -d '{"body": "Merging upstream failed:\nhttps://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"}' \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments" |
Oops, something went wrong.