Skip to content

Commit

Permalink
Merge pull request #44 from BlueAndi/release/v2.0.x
Browse files Browse the repository at this point in the history
Release/v2.0.x
  • Loading branch information
BlueAndi authored Aug 23, 2024
2 parents d7f565c + bfe43ed commit 6c6e339
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Dependencies
- name: Build CUnit
Expand Down
58 changes: 58 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Relase Script

# Controls when the action will run.
on:
release:
# A release, pre-release, or draft of a release is published.
types: [published]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# The introduction just shows some useful informations.
intro:
# The type of runner that the job will run on.
runs-on: ubuntu-latest
# Steps represent a sequence of tasks that will be executed as part of the job.
steps:
- run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "The name of the branch is ${{ github.ref }} and the repository is ${{ github.repository }}."

publish:
# The type of runner that the job will run on.
runs-on: ubuntu-latest
# Intro must run first
needs: intro
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Cache pip
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.9"

- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio
- name: Deploy Package to Registry
env:
PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }}
run: |
platformio package publish --non-interactive
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vscp-framework",
"version": "2.0.1",
"version": "2.0.2",
"description": "Very Simple Control Procotol (VSCP) Level 1 library with C interface.",
"keywords": "vscp, vscp-framework, automation, home automation",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/vscp_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ extern "C"
/** Timeout in ms for the node segment initialization.
* See VSCP specification, chapter VSCP Level I Specifics, Node segment initialization. Dynamic nodes, Step 2
*/
#define VSCP_CONFIG_NODE_SEGMENT_INIT_TIMEOUT ((uint16_t)5000)
#define VSCP_CONFIG_NODE_SEGMENT_INIT_TIMEOUT ((uint16_t)1000)

#endif /* Undefined VSCP_CONFIG_NODE_SEGMENT_INIT_TIMEOUT */

Expand Down
6 changes: 3 additions & 3 deletions src/vscp_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ extern "C"
#define VSCP_CORE_VERSION_MINOR (13)

/** VSCP specification sub-minor version number, the framework is compliant to. */
#define VSCP_CORE_VERSION_SUB_MINOR (0)
#define VSCP_CORE_VERSION_SUB_MINOR (1)

/** VSCP specification version string, the framework is compliant to. */
#define VSCP_CORE_VERSION_STR "v1.13.0"
#define VSCP_CORE_VERSION_STR "v1.13.1"

/** VSCP framework version string */
#define VSCP_CORE_FRAMEWORK_VERSION "v2.0.1"
#define VSCP_CORE_FRAMEWORK_VERSION "v2.0.2"

/*******************************************************************************
MACROS
Expand Down

0 comments on commit 6c6e339

Please sign in to comment.