|
|
@@ -1,37 +1,50 @@
|
|
|
-name: Auto Create PR from dev to master
|
|
|
+name: Auto Create and Merge PR from dev to master
|
|
|
|
|
|
on:
|
|
|
schedule:
|
|
|
- # 每周一和周四北京时间21点07分触发(UTC时间13点07分)
|
|
|
- - cron: '7 13 * * 1'
|
|
|
- - cron: '7 13 * * 4'
|
|
|
+ # 每周日和周三北京时间18点30分触发(UTC同日10点30分),较目标时间提前5小时
|
|
|
+ - cron: '30 10 * * 0'
|
|
|
+ - cron: '30 10 * * 3'
|
|
|
workflow_dispatch:
|
|
|
|
|
|
+permissions:
|
|
|
+ contents: write
|
|
|
+ pull-requests: write
|
|
|
+
|
|
|
jobs:
|
|
|
- create-pr:
|
|
|
+ create-and-merge-pr:
|
|
|
runs-on: ubuntu-latest
|
|
|
steps:
|
|
|
- - name: Checkout code
|
|
|
- uses: actions/checkout@v4
|
|
|
-
|
|
|
- - name: Install GitHub CLI
|
|
|
- run: |
|
|
|
- sudo apt-get update
|
|
|
- sudo apt-get install -y curl
|
|
|
- curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
|
|
|
- echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
|
|
|
- sudo apt-get update
|
|
|
- sudo apt-get install -y gh
|
|
|
-
|
|
|
- - name: Create Pull Request
|
|
|
+ - name: Create or find automated sync PR
|
|
|
+ id: pr
|
|
|
env:
|
|
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
|
+ GH_REPO: ${{ github.repository }}
|
|
|
TZ: Asia/Shanghai
|
|
|
run: |
|
|
|
- CURRENT_DATE=$(date +%Y.%m.%d)
|
|
|
- gh pr create \
|
|
|
+ PR_NUMBER=$(gh pr list \
|
|
|
--base master \
|
|
|
--head dev \
|
|
|
- --title "Automated PR $CURRENT_DATE" \
|
|
|
- --body "Automated PR created by GitHub Actions. Merge dev into master" \
|
|
|
- --label automated
|
|
|
+ --state open \
|
|
|
+ --label automated \
|
|
|
+ --json number \
|
|
|
+ --jq '.[0].number')
|
|
|
+
|
|
|
+ if [ -z "$PR_NUMBER" ]; then
|
|
|
+ CURRENT_DATE=$(date +%Y.%m.%d)
|
|
|
+ PR_URL=$(gh pr create \
|
|
|
+ --base master \
|
|
|
+ --head dev \
|
|
|
+ --title "Automated PR $CURRENT_DATE" \
|
|
|
+ --body "Automated PR created by GitHub Actions. Merge dev into master" \
|
|
|
+ --label automated)
|
|
|
+ PR_NUMBER=${PR_URL##*/}
|
|
|
+ fi
|
|
|
+
|
|
|
+ echo "number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
|
|
|
+
|
|
|
+ - name: Merge automated sync PR
|
|
|
+ env:
|
|
|
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
|
+ GH_REPO: ${{ github.repository }}
|
|
|
+ run: gh pr merge "${{ steps.pr.outputs.number }}" --merge
|