forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 53
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 ntr_blueshield_access
- Loading branch information
Showing
849 changed files
with
25,897 additions
and
11,459 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
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,45 @@ | ||
| name: Changelog validation | ||
|
|
||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
| issues: write | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| types: [opened, reopened, edited, labeled, unlabeled, ready_for_review] | ||
|
|
||
| jobs: | ||
| CheckCL: | ||
| runs-on: ubuntu-latest | ||
| if: github.base_ref == 'master' && github.event.pull_request.draft == false | ||
|
|
||
| steps: | ||
| - id: create_token | ||
| uses: actions/create-github-app-token@v1 | ||
| with: | ||
| app-id: ${{ secrets.APP_ID }} | ||
| private-key: ${{ secrets.PRIVATE_KEY }} | ||
|
|
||
| - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV" | ||
|
|
||
| - name: Downloading scripts | ||
| run: | | ||
| wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/changelog_utils.py | ||
| wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/check_changelog.py | ||
| wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/tags.yml | ||
| - name: Installing Python | ||
| uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 | ||
| with: | ||
| python-version: '3.x' | ||
|
|
||
| - name: Installing deps | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install ruamel.yaml PyGithub | ||
| - name: Changelog validation | ||
| env: | ||
| GITHUB_TOKEN: ${{ env.GH_TOKEN }} | ||
| run: python check_changelog.py |
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,50 @@ | ||
| name: Merge Upstream | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| merge-upstream: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - id: create_token | ||
| uses: actions/create-github-app-token@v1 | ||
| with: | ||
| app-id: ${{ secrets.APP_ID }} | ||
| private-key: ${{ secrets.PRIVATE_KEY }} | ||
|
|
||
| - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV" | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: 3.x | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install PyGithub openai | ||
| - name: Download the script | ||
| run: | | ||
| wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/changelog/changelog_utils.py | ||
| wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/merge-upstream/merge_upstream.py | ||
| wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/merge-upstream/translation_context.txt | ||
| - name: Run the script | ||
| env: | ||
| GITHUB_TOKEN: ${{ env.GH_TOKEN }} | ||
| TARGET_REPO: 'ss220club/BandaStation' | ||
| TARGET_BRANCH: 'master' | ||
| UPSTREAM_REPO: 'tgstation/tgstation' | ||
| UPSTREAM_BRANCH: 'master' | ||
| MERGE_BRANCH: 'merge-upstream' | ||
| CHANGELOG_AUTHOR: 'tgstation' | ||
| TRANSLATE_CHANGES: 'true' | ||
| OPENAI_API_KEY: ${{ secrets.ORG_EMPTY_TOKEN }} | ||
| LOG_LEVEL: ${{ runner.debug && 'DEBUG' || 'INFO' }} | ||
| run: | | ||
| git config --global user.email "action@github.com" | ||
| git config --global user.name "Upstream Sync" | ||
| python3 -u merge_upstream.py |
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.