summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2021-09-22 09:03:41 (GMT)
committerRiku Isokoski <riksu9000@gmail.com>2021-09-22 09:03:41 (GMT)
commitb2100908373f76660fcfb5f3c454eb69a38ca4ef (patch)
tree090a52c4e10646a0d7a9383920452342b4898f4c /.github/workflows
parentb31b2425f8afd5022173852f5a78592b37104c39 (diff)
parent1c3c3c8db919c703bbd3f1be4ce9c6833237ea6f (diff)
Merge branch 'develop' into detect_full_charge
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/main.yml8
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: