Merged patch 0.7.1 into dev

This commit is contained in:
Magnus Persson 2022-01-30 14:55:00 +01:00
commit 6eed5f143b
5 changed files with 67 additions and 10 deletions

53
.github/workflows/pio-build-patch.yaml vendored Normal file
View File

@ -0,0 +1,53 @@
name: PlatformIO CI Patch
on:
push:
branches:
- patch
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Cache pip
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v2
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v2
- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio
git config --global advice.detachedHead false
- name: Run PlatformIO
#run: pio run -e gravity-release -e gravity-perf -e gravity-debug
run: pio run -e gravity-release -e gravity-perf
#run: pio run -e gravity-release
- uses: EndBug/add-and-commit@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
with:
add: 'bin'
author_name: GitHub Action
author_email: mp-se@noreply.github.com
branch: patch
default_author: github_actor
message: 'GitHub Action Build'
pathspec_error_handling: ignore

View File

@ -1 +1,5 @@
<<<<<<< HEAD
{ "project":"gravmon", "version":"0.7.9", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "format.min.htm", "about.min.htm" ] }
=======
{ "project":"gravmon", "version":"0.7.1", "html": [ "index.min.htm", "device.min.htm", "config.min.htm", "calibration.min.htm", "format.min.htm", "about.min.htm" ] }
>>>>>>> master

View File

@ -8,17 +8,17 @@ v0.8.0
* Added option to set http headers (2 per http endpoint)
* Added possibility to view last 10 errors on device page.
* Added instructions for how to configure integration with Fermentrack
* Added instructions for how to configure integration with Ubidots
* Added instructions for how to configure integration with HomeAssistant
* Added instructions for how to configure integration with Brewers Friend (not verified)
v0.7.1
------
* Defined mqtt port was ignored, used default values.
* Extended length of HTTP url fields from 100 to 120 chars.
* Fixed issue with default template so it now includes the device name correctly.
* Added instructions for how to configure integration with Fermentrack
* Added instructions for how to configure integration with Ubidots
* Added instructions for how to configure integration with HomeAssistant
* Added instructions for how to configure integration with Brewers Friend (not verified)
* BUG: Defined mqtt port was ignored, used default values.
* BUG: Extended length of HTTP url fields from 100 to 120 chars.
* BUG: Fixed issue with default template so it now includes the device name correctly.
v0.7.0
------