Delete rebase.yml (#9202)
* Delete rebase.yml No longer required with new built-in GitHub PR merge master feature Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com> * Update CONTRIBUTING.md Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com> * Update greetings.yml Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com> * Update CONTRIBUTING.md Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com> * cleanup Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com>pull/9225/head
Glenn Jocher
GitHub
parent
91a81d48fa
commit
f37ac8d611
|
|
@ -17,16 +17,10 @@ jobs:
|
|||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
pr-message: |
|
||||
👋 Hello @${{ github.actor }}, thank you for submitting a YOLOv5 🚀 PR! To allow your work to be integrated as seamlessly as possible, we advise you to:
|
||||
- ✅ Verify your PR is **up-to-date with upstream/master.** If your PR is behind upstream/master an automatic [GitHub Actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) merge may be attempted by writing /rebase in a new comment, or by running the following code, replacing 'feature' with the name of your local branch:
|
||||
```bash
|
||||
git remote add upstream https://github.com/ultralytics/yolov5.git
|
||||
git fetch upstream
|
||||
# git checkout feature # <--- replace 'feature' with local branch name
|
||||
git merge upstream/master
|
||||
git push -u origin -f
|
||||
```
|
||||
- ✅ Verify all Continuous Integration (CI) **checks are passing**.
|
||||
- ✅ Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase but daily decrease, hack away the unessential. The closer to the source, the less wastage there is."_ -Bruce Lee
|
||||
|
||||
- ✅ Verify your PR is **up-to-date** with `ultralytics/yolov5` `master` branch. If your PR is behind you can update your code by clicking the 'Update branch' button or by running `git pull` and `git merge master` locally.
|
||||
- ✅ Verify all YOLOv5 Continuous Integration (CI) **checks are passing**.
|
||||
- ✅ Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase but daily decrease, hack away the unessential. The closer to the source, the less wastage there is."_ — Bruce Lee
|
||||
|
||||
issue-message: |
|
||||
👋 Hello @${{ github.actor }}, thank you for your interest in YOLOv5 🚀! Please visit our ⭐️ [Tutorials](https://github.com/ultralytics/yolov5/wiki#tutorials) to get started, where you can find quickstart guides for simple tasks like [Custom Data Training](https://github.com/ultralytics/yolov5/wiki/Train-Custom-Data) all the way to advanced concepts like [Hyperparameter Evolution](https://github.com/ultralytics/yolov5/issues/607).
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
# https://github.com/marketplace/actions/automatic-rebase
|
||||
|
||||
name: Automatic Rebase
|
||||
on:
|
||||
issue_comment:
|
||||
types: [created]
|
||||
jobs:
|
||||
rebase:
|
||||
name: Rebase
|
||||
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout the latest code
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
token: ${{ secrets.ACTIONS_TOKEN }}
|
||||
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
|
||||
- name: Automatic Rebase
|
||||
uses: cirrus-actions/rebase@1.7
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
|
||||
|
|
@ -45,20 +45,15 @@ changes** button. All done, your PR is now submitted to YOLOv5 for review and ap
|
|||
|
||||
To allow your work to be integrated as seamlessly as possible, we advise you to:
|
||||
|
||||
- ✅ Verify your PR is **up-to-date with upstream/master.** If your PR is behind upstream/master an
|
||||
automatic [GitHub Actions](https://github.com/ultralytics/yolov5/blob/master/.github/workflows/rebase.yml) merge may
|
||||
be attempted by writing /rebase in a new comment, or by running the following code, replacing 'feature' with the name
|
||||
of your local branch:
|
||||
- ✅ Verify your PR is **up-to-date** with `ultralytics/yolov5` `master` branch. If your PR is behind you can update
|
||||
your code by clicking the 'Update branch' button or by running `git pull` and `git merge master` locally.
|
||||
|
||||
```bash
|
||||
git remote add upstream https://github.com/ultralytics/yolov5.git
|
||||
git fetch upstream
|
||||
# git checkout feature # <--- replace 'feature' with local branch name
|
||||
git merge upstream/master
|
||||
git push -u origin -f
|
||||
```
|
||||
<p align="center"><img width="751" alt="Screenshot 2022-08-29 at 22 47 15" src="https://user-images.githubusercontent.com/26833433/187295893-50ed9f44-b2c9-4138-a614-de69bd1753d7.png"></p>
|
||||
|
||||
- ✅ Verify all YOLOv5 Continuous Integration (CI) **checks are passing**.
|
||||
|
||||
<p align="center"><img width="751" alt="Screenshot 2022-08-29 at 22 47 03" src="https://user-images.githubusercontent.com/26833433/187296922-545c5498-f64a-4d8c-8300-5fa764360da6.png"></p>
|
||||
|
||||
- ✅ Verify all Continuous Integration (CI) **checks are passing**.
|
||||
- ✅ Reduce changes to the absolute **minimum** required for your bug fix or feature addition. _"It is not daily increase
|
||||
but daily decrease, hack away the unessential. The closer to the source, the less wastage there is."_ — Bruce Lee
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue