Merge branch 'master' into changelog_automation

This commit is contained in:
Mike
2021-06-22 16:53:53 -07:00
committed by Mike
4 changed files with 20 additions and 6 deletions

View File

@@ -1,3 +1,18 @@
<a name="v1.2.2"></a>
## [v1.2.2] - 2021-06-22
### Ci
- remove Jenkins chron
- **changelog:** add automation for changelog generation
### Fix
- update examples text and version
<a name="v1.2.1"></a>
## [v1.2.1] - 2021-05-06
### Fix
**docker:** add missing ca-certs
<a name="v1.2.0"></a> <a name="v1.2.0"></a>
## v1.2.0 ## v1.2.0

View File

@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.1) cmake_minimum_required (VERSION 3.1)
project (rpc VERSION 1.2.0) project (rpc VERSION 1.2.1)
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 11)

1
Jenkinsfile vendored
View File

@@ -1,6 +1,5 @@
pipeline { pipeline {
agent none agent none
triggers {cron '@daily'}
options { options {
buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '30')) buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '30'))
timestamps() timestamps()

View File

@@ -49,15 +49,15 @@ void usage_show_help()
std::cout << "Examples:" << std::endl; std::cout << "Examples:" << std::endl;
std::cout << " # Activate platform using profile1" << std::endl; std::cout << " # Activate platform using profile1" << std::endl;
std::cout << " " << PROJECT_NAME << \ std::cout << " " << PROJECT_NAME << \
" --url wss://localhost:8080 --cmd \"-t activate --profile profile1\"" << std::endl; " --url wss://192.168.86.100/activate --cmd \"-t activate --profile profile1\"" << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << " # Activate platform using profile1 and override DNS detection" << std::endl; std::cout << " # Activate platform using profile1 and override DNS detection" << std::endl;
std::cout << " " << PROJECT_NAME << \ std::cout << " " << PROJECT_NAME << \
" --url wss://localhost:8080 --cmd \"-t activate --profile profile1\" --dns corp.com" << std::endl; " --url wss://mycloud.com/activate --cmd \"-t activate --profile profile1\" --dns corp.com" << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << " # Deactivate platform and connect through a proxy" << std::endl; std::cout << " # Deactivate platform and connect through a proxy" << std::endl;
std::cout << " " << PROJECT_NAME << \ std::cout << " " << PROJECT_NAME << \
" -u wss://localhost:8080 -c \"-t deactivate --password P@ssw0rd\" -p http://proxy.com:1000" << std::endl; " -u wss://mycloud.com/activate -c \"-t deactivate --password P@ssw0rd\" -p http://proxy.com:1000" << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << " # Show all informational items" << std::endl; std::cout << " # Show all informational items" << std::endl;
std::cout << " " << PROJECT_NAME << " --amtinfo all" << std::endl; std::cout << " " << PROJECT_NAME << " --amtinfo all" << std::endl;