summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2021-09-26 09:16:55 (GMT)
committerGitea <gitea@fake.local>2021-09-26 09:16:55 (GMT)
commit6652ec6f71967f4a8eea1f159aa500a1a21a5902 (patch)
treecdbbf9afede8ea74258867ba41905a3fe0d784f4 /.github/workflows
parent6c3d6fb2575888e582e7ef3004a0bc3bf6c588b6 (diff)
parentd03db14129b4f8cc2e691dd6f9e8d8d1ed52b7a1 (diff)
Merge branch 'develop' of JF/PineTime into master
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: