diff --git a/.github/workflows/pio-build-patch.yaml b/.github/workflows/pio-build-patch.yaml new file mode 100644 index 0000000..7bb1915 --- /dev/null +++ b/.github/workflows/pio-build-patch.yaml @@ -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 diff --git a/bin/config.min.htm b/bin/config.min.htm index 969958e..70ddf19 100644 --- a/bin/config.min.htm +++ b/bin/config.min.htm @@ -1 +1 @@ -Beer Gravity Monitor

Temperature Format:

Gravity Format:

(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor

Temperature Format:

Gravity Format:

(C) Copyright 2021-22 Magnus Persson
diff --git a/bin/device.min.htm b/bin/device.min.htm index 8b61340..b9fd4ac 100644 --- a/bin/device.min.htm +++ b/bin/device.min.htm @@ -1 +1 @@ -Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
(C) Copyright 2021-22 Magnus Persson
\ No newline at end of file +Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
(C) Copyright 2021-22 Magnus Persson
diff --git a/bin/version.json b/bin/version.json index 698fd2b..740d2cc 100644 --- a/bin/version.json +++ b/bin/version.json @@ -1 +1,5 @@ -{ "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" ] } \ No newline at end of file +<<<<<<< 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 diff --git a/src_docs/source/releases.rst b/src_docs/source/releases.rst index 30f0170..86338b7 100644 --- a/src_docs/source/releases.rst +++ b/src_docs/source/releases.rst @@ -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 ------