Merge branch 'master' into dev-v1.2

This commit is contained in:
Gunnar Skjold 2020-03-30 20:12:13 +02:00
commit 8457db50f6
3 changed files with 8 additions and 2 deletions

View File

@ -14,11 +14,16 @@ jobs:
steps:
- name: Check out code from repo
uses: actions/checkout@v1
- name: Get release version from tag
- name: Get release version for filenames
id: release_tag
env:
GITHUB_REF: ${{ github.ref }}
run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
- name: Get release version for code
id: release_tag
env:
GITHUB_REF: ${{ github.ref }}
run: echo ::set-env name=GITHUB_TAG::$(echo ${GITHUB_REF##*/})
- name: Cache Python dependencies
uses: actions/cache@v1
with:

View File

@ -1,7 +1,7 @@
import os
FILENAME_VERSION_H = 'src/version.h'
version = os.environ.get('GITHUB_REF')
version = os.environ.get('GITHUB_TAG')
if version == None:
version = "SNAPSHOT"

View File

@ -17,6 +17,7 @@
*/
#include "AmsToMqttBridge.h"
#define ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD 1e9
#include <ArduinoJson.h>
#include <MQTT.h>
#include <DNSServer.h>