i have low inteligence
This commit is contained in:
parent
bff01f027d
commit
f6c69ba310
1 changed files with 4 additions and 4 deletions
|
|
@ -20,12 +20,12 @@ jobs:
|
|||
- name: Add Upstream and Fetch
|
||||
run: |
|
||||
git remote add upstream https://github.com/cinnyapp/cinny.git
|
||||
git fetch upstream main
|
||||
git fetch upstream dev
|
||||
|
||||
- name: Check for Changes and Push Branch
|
||||
id: check_changes
|
||||
run: |
|
||||
if ! git diff --quiet HEAD upstream/main; then
|
||||
if ! git diff --quiet HEAD upstream/dev; then
|
||||
echo "New changes detected in upstream."
|
||||
|
||||
BRANCH_NAME="upstream-sync-$(date +'%Y%m%d%H%M')"
|
||||
|
|
@ -33,7 +33,7 @@ jobs:
|
|||
echo "has_changes=true" >> $GITHUB_OUTPUT
|
||||
|
||||
git checkout -b $BRANCH_NAME
|
||||
git merge upstream/main --no-edit
|
||||
git merge upstream/dev --no-edit
|
||||
|
||||
git push origin $BRANCH_NAME
|
||||
else
|
||||
|
|
@ -47,7 +47,7 @@ jobs:
|
|||
PR_TITLE="chore(deps): sync upstream changes ($(date +'%Y-%m-%d'))"
|
||||
PR_BODY="Upstream (cinnyapp/cinny)에 새로운 변경사항이 감지되어 자동으로 생성된 PR입니다."
|
||||
HEAD_BRANCH="${{ steps.check_changes.outputs.branch_name }}"
|
||||
BASE_BRANCH="main"
|
||||
BASE_BRANCH="dev"
|
||||
|
||||
curl -X 'POST' \
|
||||
"${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue