forked from ss220club/Paradise-SS220
-
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.
Merge Upstream Workflow pt. 2 (ss220club#1709)
## Что этот PR делает Улучшения мерж воркфлоу. - [x] Перевод чейнджлога через GPT 4o. - [x] Проверка на существование мерж ПРа. Чья-то работа не будет случайно сброшена форс-пушем. - [x] Отключение буферизации вывода логов. - [x] Использование GitHub App в проверке чейнджлога (в крысу). ## Тестирование Проверил на форке.
- Loading branch information
1 parent
d334185
commit 1a8b92c
Showing
5 changed files
with
327 additions
and
87 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,30 @@ | ||
name: Check Master Merged | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- master | ||
|
||
jobs: | ||
check-master-merged: | ||
runs-on: ubuntu-latest | ||
if: github.head_ref == 'merge-upstream' | ||
|
||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.base_ref }} | ||
|
||
- name: Fetch head branch | ||
run: git fetch origin ${{ github.head_ref }} | ||
|
||
- name: Check if master is merged | ||
run: | | ||
git checkout ${{ github.head_ref }} | ||
if git merge-base --is-ancestor origin/${{ github.base_ref }} HEAD; then | ||
exit 0 | ||
else | ||
echo "Base branch is NOT merged into the head branch. Merge base branch to keep CI checks relevant." | ||
exit 1 | ||
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,12 +24,13 @@ jobs: | |
- name: Install dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install PyGithub googletrans==4.0.0-rc1 | ||
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: | ||
|
@@ -39,9 +40,10 @@ jobs: | |
UPSTREAM_REPO: 'ParadiseSS13/Paradise' | ||
UPSTREAM_BRANCH: 'master' | ||
MERGE_BRANCH: 'merge-upstream' | ||
TRANSLATE_CHANGES: 'true' | ||
CHANGELOG_AUTHOR: 'ParadiseSS13' | ||
TRANSLATE_CHANGES: 'true' | ||
OPENAI_API_KEY: ${{ secrets.ORG_EMPTY_TOKEN }} | ||
run: | | ||
git config --global user.email "[email protected]" | ||
git config --global user.name "Upstream Sync" | ||
python3 merge_upstream.py | ||
python3 -u merge_upstream.py |
Oops, something went wrong.