Skip to content

Commit

Permalink
Correctly bump version, modify workflow
Browse files Browse the repository at this point in the history
Signed-off-by: Sara Damiano <[email protected]>
  • Loading branch information
SRGDamia1 committed May 24, 2021
1 parent 8b25d8c commit a5a2ce3
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ with your board before submitting any issues.

Modem: <!-- Brand, model, variant, firmware version, ie Quectel BG96 Revision: BG96MAR02A07M1G -->
Main processor board: <!-- Uno, Zero, ESP32, Particle, etc -->
TinyGSM version: <!-- always try to use the latest (0.11.3) -->
TinyGSM version: <!-- always try to use the latest (0.11.4) -->
Code: <!-- Example name or paste in your code -->

### Scenario, steps to reproduce
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Examples
name: Build Examples with PlatformIO

# Triggers the workflow on push or pull request events
on: [push, pull_request]
Expand Down Expand Up @@ -53,23 +53,6 @@ jobs:
echo "LIBRARY_INSTALL_SOURCE=https://github.com/${GITHUB_REPOSITORY}.git#${GITHUB_HEAD_REF}" >> $GITHUB_ENV
fi
- name: Restore or Cache pip
uses: actions/[email protected]
with:
path: ~/.cache/pip
# if requirements.txt hasn't changed, then it will be a "cache hit" and pip will be restored
# if requirements.txt HAS changed, it will be a "cache miss" and a new cache of pip will be created if the job completes successfully
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: ${{ runner.os }}-pip-

- name: Restore or Cache PlatformIO and Libraries
uses: actions/[email protected]
with:
path: ~/.platformio
# if nothing in the lock files has changed, then it will be a "cache hit" and pip will be restored
# otherwise, it will be a "cache miss" and a new cache of libraries will be created if the job completes successfully
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}

- name: Set up Python
uses: actions/setup-python@v2

Expand All @@ -79,14 +62,28 @@ jobs:
python -m pip install --upgrade pip
pip install --upgrade platformio
- name: Restore or Cache Platforms and Libraries
uses: actions/[email protected]
id: cache_pio
with:
path: ~/.platformio
# if nothing in the example_dependencies.json file has changed, then it will
# be a "cache hit" and we can restore libraries from cache and not
# download them. If it has changed we have to re-download.
key: ${{ hashFiles('./examples/example_dependencies.json') }}

# Install cores and library dependencies for the Arduino CLI, iff no cache
- name: Install the Arduino libraries
if: steps.cache_pio.outputs.cache-hit != 'true'
run: pio lib --global install 89 415 1202 1286

- name: Run PlatformIO
env:
PLATFORMIO_CI_SRC: ${{ matrix.example }}
TINYGSM_MODEM_TO_USE: ${{ matrix.modem }}
run: |
echo "${{ env.LIBRARY_INSTALL_SOURCE }}"
pio lib --global install ${{ env.LIBRARY_INSTALL_SOURCE }}
pio lib --global install 89 415 1202 1286
sed -i 's/\/\/ #define TINY_GSM_MODEM_SIM800/#define TINY_GSM_MODEM_SIM800/g' ${{ matrix.example }}/*
platformio ci --project-option='build_flags=-D ${{ env.TINYGSM_MODEM_TO_USE }}' --project-option='framework=arduino' --board=uno --board=leonardo --board=yun --board=megaatmega2560 --board=genuino101 --board=mkr1000USB --board=zero --board=teensy31 --board=bluepill_f103c8 --board=uno_pic32 --board=esp01 --board=nodemcuv2 --board=esp32dev
pio lib --global uninstall TinyGSM
41 changes: 41 additions & 0 deletions examples/example_dependencies.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[
{
"name": "PubSubClient",
"owner": "knolleary",
"library id": "89",
"url": "https://github.com/knolleary/pubsubclient.git",
"version": "~2.8",
"note": "A client library for MQTT messaging.",
"authors": ["Nick O'Leary"]
},
{
"name": "Blynk",
"owner": "blynkkk",
"library id": "415",
"url": "https://github.com/blynkkk/blynk-library.git",
"version": "~0.6.7",
"authors": ["Volodymyr Shymanskyy"],
"frameworks": "*",
"platforms": "*"
},
{
"name": "AceCRC",
"owner": "bxparks",
"library id": "1202",
"url": "https://github.com/bxparks/AceCRC.git",
"version": "~1.0.1",
"authors": ["Brian T. Park"],
"frameworks": "*",
"platforms": "*"
},
{
"name": "StreamDebugger",
"owner": "vshymanskyy",
"library id": "1286",
"url": "https://github.com/vshymanskyy/StreamDebugger.git",
"version": "~1.0.1",
"authors": ["Volodymyr Shymanskyy"],
"frameworks": "*",
"platforms": "*"
}
]
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "TinyGSM",
"version": "0.11.3",
"version": "0.11.4",
"description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports many GSM, LTE, and WiFi modules with AT command interfaces.",
"keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM7000, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968, M95, MC60, MC60E, BG96, ublox, Quectel, SIMCOM, AI Thinker, LTE, LTE-M",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=TinyGSM
version=0.11.3
version=0.11.4
author=Volodymyr Shymanskyy
maintainer=Volodymyr Shymanskyy
sentence=A small Arduino library for GPRS modules, that just works.
Expand Down
2 changes: 1 addition & 1 deletion src/TinyGsmCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define SRC_TINYGSMCOMMON_H_

// The current library version number
#define TINYGSM_VERSION "0.10.9"
#define TINYGSM_VERSION "0.11.4"

#if defined(SPARK) || defined(PARTICLE)
#include "Particle.h"
Expand Down

0 comments on commit a5a2ce3

Please sign in to comment.