From bb131238aabf94fe619199bc2bee81be70989776 Mon Sep 17 00:00:00 2001 From: Piotr Skalski Date: Thu, 27 May 2021 17:01:36 +0200 Subject: [PATCH] update ci-testing.yml (#3322) * update ci-testing.yml * update greetings.yml * bring back os matrix --- .github/workflows/ci-testing.yml | 6 ++---- .github/workflows/greetings.yml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index df508474a955..bb8b173cdb31 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -2,12 +2,10 @@ name: CI CPU testing on: # https://help.github.com/en/actions/reference/events-that-trigger-workflows push: - branches: [ master ] + branches: [ master, develop ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] - schedule: - - cron: '0 0 * * *' # Runs at 00:00 UTC every day + branches: [ master, develop ] jobs: cpu-tests: diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index ee472297107e..4e502fe9af7b 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -16,7 +16,7 @@ jobs: git remote add upstream https://github.com/ultralytics/yolov5.git git fetch upstream git checkout feature # <----- replace 'feature' with local branch name - git rebase upstream/master + git rebase upstream/develop git push -u origin -f ``` - ✅ Verify all Continuous Integration (CI) **checks are passing**.