diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-09-18 16:22:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-18 16:22:59 (GMT) |
| commit | e468acc99e4d7e188dc902983640f5eb8e8ff31f (patch) | |
| tree | 8c0c402ff93d4c13fbd1043457fbbb238af0f000 /.github | |
| parent | 8f0771183c3872343100a2e974f37c91237da277 (diff) | |
| parent | 5855906e49ce8bc4042e93817c6aba3a70fab089 (diff) | |
Merge branch 'develop' into update_touch_driver
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4744eae..bd24359 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,13 +9,13 @@ name: Build PineTime Firmware # When to run this Workflow... on: - # Run this Workflow when files are updated (Pushed) in the "master" Branch + # Run this Workflow when files are updated (Pushed) in the "master" and "develop" Branch push: - branches: [ master ] + branches: [ master, develop ] - # Also run this Workflow when a Pull Request is created or updated in the "master" Branch + # Also run this Workflow when a Pull Request is created or updated in the "master" and "develop" Branch pull_request: - branches: [ master ] + branches: [ master, develop ] # Steps to run for the Workflow jobs: |