Skip to content

Test merge back 2 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdb9696 wants to merge 11 commits into
base: test_merge
Choose a base branch
from
Open

Test merge back 2 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2f24797
Enable CI on the patch branch (#1042)
sdb9696 Jul 4, 2024
fe116ea
Handle module errors more robustly and add query params to light pres…
sdb9696 Jul 4, 2024
407cedf
Prepare 0.7.0.3 (#1045)
sdb9696 Jul 4, 2024
5dac092
Defer module updates for less volatile modules (pick 1052) (#1056)
sdb9696 Jul 11, 2024
377fa06
Use first known thermostat state as main state (pick #1054) (#1057)
sdb9696 Jul 11, 2024
448efd7
Prepare 0.7.0.4 (#1059)
sdb9696 Jul 11, 2024
a97d2c9
Only refresh smart LightEffect module daily (#1064)
sdb9696 Jul 17, 2024
c4a9a19
Redact sensitive info from debug logs (#1069)
sdb9696 Jul 17, 2024
82cff13
Prepare 0.7.0.5
sdb9696 Jul 18, 2024
7266d70
0.7.0.5 (#1077)
sdb9696 Jul 18, 2024
ed42660
Merge `patch` into `patch_master`
sdb9696 Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: ["master"]
branches: ["master", "patch"]
pull_request:
branches: ["master"]
branches: ["master", "patch"]
workflow_dispatch: # to allow manual re-runs

env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL checks"

on:
push:
branches: [ master ]
branches: [ "master", "patch" ]
pull_request:
branches: [ master ]
branches: [ master, "patch" ]
schedule:
- cron: '44 17 * * 3'

Expand Down
Loading