diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8dc0858b..a2c289d8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,7 +22,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 with: - repository: ${{ github.event.pull_request_target.head.repo.full_name || github.repository }} + repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }} token: ${{ secrets.GITHUB_TOKEN }} ref: ${{ github.head_ref || github.ref }} fetch-depth: 0 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 61a6cc0c..4f7fd5b6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -172,16 +172,19 @@ jobs: python -m build python -m twine upload dist/* -u __token__ -p $PYPI_TOKEN - name: Extract PR Details + env: + GH_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN || secrets.GITHUB_TOKEN }} run: | - if [ "${{ github.event_name }}" = "pull_request" ]; then - PR_JSON=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}) + # Check if the event is a pull request or pull_request_target + if [ "${{ github.event_name }}" = "pull_request" ] || [ "${{ github.event_name }}" = "pull_request_target" ]; then PR_NUMBER=${{ github.event.pull_request.number }} - PR_TITLE=$(echo $PR_JSON | jq -r '.title') + PR_TITLE=$(gh pr view $PR_NUMBER --json title --jq '.title') else + # Use gh to find the PR associated with the commit COMMIT_SHA=${{ github.event.after }} - PR_JSON=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/search/issues?q=repo:${{ github.repository }}+is:pr+is:merged+sha:$COMMIT_SHA") - PR_NUMBER=$(echo $PR_JSON | jq -r '.items[0].number') - PR_TITLE=$(echo $PR_JSON | jq -r '.items[0].title') + PR_JSON=$(gh pr list --search "${COMMIT_SHA}" --state merged --json number,title --jq '.[0]') + PR_NUMBER=$(echo $PR_JSON | jq -r '.number') + PR_TITLE=$(echo $PR_JSON | jq -r '.title') fi echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV echo "PR_TITLE=$PR_TITLE" >> $GITHUB_ENV diff --git a/docs/en/hub/index.md b/docs/en/hub/index.md index cc5177ca..dbd58378 100644 --- a/docs/en/hub/index.md +++ b/docs/en/hub/index.md @@ -18,7 +18,6 @@ keywords: Ultralytics HUB, YOLO models, train YOLO, YOLOv5, YOLOv8, object detec Português | Türkçe | Tiếng Việt | -हिन्दी | العربية