Skip to content

Commit

Permalink
Merge pull request #22 from Grizzelbee/development
Browse files Browse the repository at this point in the history
Development v1.1.3
  • Loading branch information
Grizzelbee authored Sep 1, 2023
2 parents d4080dd + 95fb815 commit 28ed6ed
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 90 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/npm-publish.yml

This file was deleted.

56 changes: 28 additions & 28 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,34 +79,34 @@ jobs:
# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options
# Then uncomment the following block:

# # Deploys the final package to NPM
# deploy:
# needs: [adapter-tests]
#
# # Trigger this step only when a commit on master is tagged with a version number
# if: |
# contains(github.event.head_commit.message, '[skip ci]') == false &&
# github.event_name == 'push' &&
# github.event.base_ref == 'refs/heads/master' &&
# startsWith(github.ref, 'refs/tags/v')
#
# runs-on: ubuntu-latest
# strategy:
# matrix:
# node-version: [12.x]
#
# steps:
# - uses: actions/checkout@v1
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: ${{ matrix.node-version }}
#
# - name: Publish package to npm
# run: |
# npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
# npm whoami
# npm publish
# Deploys the final package to NPM
deploy:
needs: [adapter-tests]

# Trigger this step only when a commit on master is tagged with a version number
if: |
contains(github.event.head_commit.message, '[skip ci]') == false &&
github.event_name == 'push' &&
github.event.base_ref == 'refs/heads/master' &&
startsWith(github.ref, 'refs/tags/v')
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Publish package to npm
run: |
npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
npm whoami
npm publish
# Dummy job for skipped builds - without this, github reports the build as failed
skip-ci:
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ It is possible to control the extensions GPIO 1, GPIO 2, OUT 1 and OUT 2 of the
### Work in progress
* to use timePickers in admin at least admin version 6.4.3 is required - will implement as soon as admin >= 6.4.3 is in stable repo.

### 1.1.3 (2023-09-01)
* (grizzelbee) New: Added release script for easier publishing to stable repo

### 1.1.1 (2023-08-24)
* (grizzelbee) Fix: Fixed status.stopped for push messages.

Expand Down
15 changes: 14 additions & 1 deletion io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
{
"common": {
"name": "robonect",
"version": "1.1.1",
"version": "1.1.3",
"news": {
"1.1.3": {
"en": "New: Added release script for easier publishing to stable repo",
"de": "Neu: Release-Skript zur einfacheren Veröffentlichung im Stable Repo hinzugefügt",
"ru": "Новое: добавлен скрипт выпуска для упрощения публикации в стабильном репозитории.",
"pt": "Novo: Adicionado script de lançamento para publicação mais fácil em repositório estável",
"nl": "Nieuw: Releasescript toegevoegd voor eenvoudiger publiceren naar stabiele opslagplaats",
"fr": "Nouveau : ajout d'un script de publication pour une publication plus facile sur un dépôt stable",
"it": "Novità: aggiunto script di rilascio per una pubblicazione più semplice su repository stabili",
"es": "Nuevo: Se agregó un script de lanzamiento para facilitar la publicación en el repositorio estable.",
"pl": "Nowość: Dodano skrypt wydania dla łatwiejszego publikowania w stabilnym repozytorium",
"uk": "Нове: додано сценарій випуску для легшої публікації в стабільному репо",
"zh-cn": "新增内容:添加了发布脚本,以便更轻松地发布到稳定的存储库"
},
"1.1.1": {
"en": "Fix: Fixed status.stopped for push messages.",
"de": "Fix: Status.stopped für Push-Nachrichten behoben.",
Expand Down
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ class Robonect extends utils.Adapter {
async getValueAsync(id){
this.log.silly(`getValueAsync for id: ${id}`);
const state = await this.getStateAsync(id);
this.log.silly(`Returning value: ${state.val}`);
if (state) this.log.silly(`Returning value: ${state.val}`);
return state.val;
}

Expand Down
44 changes: 22 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.robonect",
"version": "1.1.1",
"version": "1.1.3",
"description": "Robonect HX for lawn mower robots from Husquarna, Flymo, McCulloch and Gardena",
"keywords": [
"ioBroker",
Expand All @@ -14,8 +14,8 @@
},
"license": "MIT",
"author": {
"name": "braindead1",
"email": "[email protected]"
"name": "grizzelbee",
"email": "[email protected]"
},
"contributors": [
{
Expand Down Expand Up @@ -50,7 +50,7 @@
},
"dependencies": {
"@iobroker/adapter-core": "^3.0.3",
"axios": "^1.4.0",
"axios": "^1.5.0",
"http": "^0.0.1-security",
"json-logic-js": "^2.0.2",
"ping": "^0.4.4",
Expand All @@ -64,13 +64,13 @@
"@types/chai-as-promised": "^7.1.5",
"@types/gulp": "^4.0.13",
"@types/mocha": "^10.0.1",
"@types/node": "^20.5.4",
"@types/node": "^20.5.8",
"@types/proxyquire": "^1.3.28",
"@types/sinon": "^10.0.16",
"@types/sinon-chai": "^3.2.9",
"chai": "^4.3.7",
"chai": "^4.3.8",
"chai-as-promised": "^7.1.1",
"eslint": "^8.47.0",
"eslint": "^8.48.0",
"mocha": "^10.2.0",
"proxyquire": "^2.1.3",
"sinon": "^15.2.0",
Expand All @@ -83,6 +83,7 @@
"test:unit": "mocha test/unit --exit",
"test:integration": "mocha test/integration --exit",
"test": "npm run test:js && npm run test:package",
"lint": "eslint"
"lint": "eslint",
"release": "release-script"
}
}

0 comments on commit 28ed6ed

Please sign in to comment.