-
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 remote-tracking branch 'yolov8/main'
# Conflicts: # ultralytics/nn/tasks.py
- Loading branch information
Showing
412 changed files
with
4,346 additions
and
3,149 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 |
---|---|---|
|
@@ -26,7 +26,7 @@ jobs: | |
steps: | ||
- name: CLA Assistant | ||
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I sign the CLA') || github.event_name == 'pull_request_target' | ||
uses: contributor-assistant/[email protected].1 | ||
uses: contributor-assistant/[email protected].2 | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
# Must be repository secret PAT | ||
|
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 |
---|---|---|
|
@@ -17,7 +17,7 @@ name: Publish Docs | |
on: | ||
push: | ||
branches: [main] | ||
pull_request_target: | ||
pull_request: | ||
branches: [main] | ||
workflow_dispatch: | ||
|
||
|
@@ -48,7 +48,7 @@ jobs: | |
continue-on-error: true | ||
run: ruff check --fix --unsafe-fixes --select D --ignore=D100,D104,D203,D205,D212,D213,D401,D406,D407,D413 . | ||
- name: Update Docs Reference Section and Push Changes | ||
if: github.event_name == 'pull_request_target' | ||
continue-on-error: true | ||
run: | | ||
python docs/build_reference.py | ||
git pull origin ${{ github.head_ref || github.ref }} | ||
|
@@ -68,7 +68,7 @@ jobs: | |
python docs/build_docs.py | ||
- name: Commit and Push Docs changes | ||
continue-on-error: true | ||
if: always() && github.event_name == 'pull_request_target' | ||
if: always() | ||
run: | | ||
git pull origin ${{ github.head_ref || github.ref }} | ||
git add --update # only add updated files | ||
|
@@ -81,21 +81,18 @@ jobs: | |
fi | ||
- name: Publish Docs to https://docs.ultralytics.com | ||
if: github.event_name == 'push' | ||
env: | ||
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} | ||
INDEXNOW_KEY: ${{ secrets.INDEXNOW_KEY_DOCS }} | ||
run: | | ||
git clone https://github.com/ultralytics/docs.git docs-repo | ||
cd docs-repo | ||
git checkout gh-pages || git checkout -b gh-pages | ||
rm -rf * | ||
cp -R ../site/* . | ||
echo "$INDEXNOW_KEY" > "$INDEXNOW_KEY.txt" | ||
echo "${{ secrets.INDEXNOW_KEY_DOCS }}" > "${{ secrets.INDEXNOW_KEY_DOCS }}.txt" | ||
git add . | ||
if git diff --staged --quiet; then | ||
echo "No changes to commit" | ||
else | ||
LATEST_HASH=$(git rev-parse --short=7 HEAD) | ||
git commit -m "Update Docs for 'ultralytics ${{ steps.check_pypi.outputs.version }} - $LATEST_HASH'" | ||
git push https://[email protected]/ultralytics/docs.git gh-pages | ||
git push https://${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/ultralytics/docs.git gh-pages | ||
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
This file was deleted.
Oops, something went wrong.
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
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
Oops, something went wrong.