diff --git a/.github/workflows/auto-gh-pr.yml b/.github/workflows/auto-gh-pr.yml index a7e8ff5d4..9a7173ec3 100644 --- a/.github/workflows/auto-gh-pr.yml +++ b/.github/workflows/auto-gh-pr.yml @@ -5,12 +5,6 @@ on: # types: # - closed -env: - GH_TOKEN: ${{ secrets.REDBOT_GITHUB_TOKEN }} - ISSUE: ${{ github.event.issue.html_url }} - OWNER: ${{ github.repository_owner }} - REPO: ${{ github.event.repository.name }} - jobs: create-pr: runs-on: ubuntu-latest @@ -29,14 +23,14 @@ jobs: sudo apt-get install gh continue-on-error: true - - name: Configure GitHub CLI - run: | - git config --global user.email "3293172751ysy@gmail.com" - git config --global user.name "kubbot" - echo "${{ secrets.BOT_GITHUB_TOKEN }}" | gh auth login --with-token + # - name: Configure GitHub CLI + # run: | + # git config --global user.email "3293172751ysy@gmail.com" + # git config --global user.name "kubbot" + # echo "${{ secrets.BOT_GITHUB_TOKEN }}" | gh auth login --with-token - name: Create PR to release branch run: | - ISSUEID=$(gh pr view 642 --repo $OWNER/$REPO | grep -oP 'Fixes #\K\d+') + ISSUEID=$(gh pr view ${{ github.event.pull_request.number }} --repo $OWNER/$REPO | grep -oP 'Fixes #\K\d+') echo "===========> $ISSUEID" ISSUE=$(gh issue view $ISSUEID --repo $OWNER/$REPO --json labels,assignees,milestone,title) echo "===========> $ISSUE" @@ -46,12 +40,17 @@ jobs: MILESTONE=$(echo $ISSUE | jq -r '.milestone | select(.title) | .title') TITLE=$(echo $ISSUE | jq -r '.title') - echo $ISSUE | jq - gh pr edit ${{ github.event.pull_request.number }} --repo $OWNER/$REPO --add-label "$LABELS" --add-assignee "$ASSIGNEES" --milestone "$MILESTONE" git checkout -b bot/merge-to-release-$ISSUEID git push origin bot/merge-to-release-$ISSUEID gh pr create --base release --head bot/merge-to-release-$ISSUEID --title "Merge main to release" --body "" - # gh pr create --base main --head feat/auto-release-pr-624 --title "The bug is fixed" --body "$x" --repo OpenIMSDK/Open-IM-Server --reviewer "cubxxw" \ No newline at end of file + # gh pr create --base main --head feat/auto-release-pr-624 --title "The bug is fixed" --body "$x" --repo OpenIMSDK/Open-IM-Server --reviewer "cubxxw" + continue-on-error: true + env: + GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} + GH_TOKEN: ${{ github.token }} + ISSUE: ${{ github.event.issue.html_url }} + OWNER: ${{ github.repository_owner }} + REPO: ${{ github.event.repository.name }} \ No newline at end of file