Piotr Skalski commited on
Commit
3fea068
·
1 Parent(s): 4d4a2b0

update ci-testing.yml (#3322)

Browse files

* update ci-testing.yml

* update greetings.yml

* bring back os matrix

.github/workflows/ci-testing.yml CHANGED
@@ -2,12 +2,10 @@ name: CI CPU testing
2
 
3
  on: # https://help.github.com/en/actions/reference/events-that-trigger-workflows
4
  push:
5
- branches: [ master ]
6
  pull_request:
7
  # The branches below must be a subset of the branches above
8
- branches: [ master ]
9
- schedule:
10
- - cron: '0 0 * * *' # Runs at 00:00 UTC every day
11
 
12
  jobs:
13
  cpu-tests:
 
2
 
3
  on: # https://help.github.com/en/actions/reference/events-that-trigger-workflows
4
  push:
5
+ branches: [ master, develop ]
6
  pull_request:
7
  # The branches below must be a subset of the branches above
8
+ branches: [ master, develop ]
 
 
9
 
10
  jobs:
11
  cpu-tests:
.github/workflows/greetings.yml CHANGED
@@ -16,7 +16,7 @@ jobs:
16
  git remote add upstream https://github.com/ultralytics/yolov5.git
17
  git fetch upstream
18
  git checkout feature # <----- replace 'feature' with local branch name
19
- git rebase upstream/master
20
  git push -u origin -f
21
  ```
22
  - ✅ Verify all Continuous Integration (CI) **checks are passing**.
 
16
  git remote add upstream https://github.com/ultralytics/yolov5.git
17
  git fetch upstream
18
  git checkout feature # <----- replace 'feature' with local branch name
19
+ git rebase upstream/develop
20
  git push -u origin -f
21
  ```
22
  - ✅ Verify all Continuous Integration (CI) **checks are passing**.