Skip to content

Commit

Permalink
Merge pull request #76 from Grizzelbee/development_1.5.0
Browse files Browse the repository at this point in the history
Version 1.5.2
  • Loading branch information
Grizzelbee committed Aug 9, 2023
2 parents e7623c0 + dfdbd6c commit bd2ab3e
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 315 deletions.
205 changes: 67 additions & 138 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,152 +3,81 @@ name: Test and Release
# Run this job on all pushes and pull requests
# as well as tags with a semantic version
on:
push:
branches:
- "*"
tags:
# normal versions
- "v[0-9]+.[0-9]+.[0-9]+"
# pre-releases
- "v[0-9]+.[0-9]+.[0-9]+-**"
pull_request: {}
push:
branches:
- "master"
tags:
# normal versions
- "v[0-9]+.[0-9]+.[0-9]+"
# pre-releases
- "v[0-9]+.[0-9]+.[0-9]+-**"
pull_request: {}

jobs:
# Performs quick checks before the expensive test runs
check-and-lint:
if: contains(github.event.head_commit.message, '[skip ci]') == false
# Performs quick checks before the expensive test runs
check-and-lint:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ubuntu-latest

steps:
- uses: ioBroker/testing-action-check@v1
with:
node-version: '14.x'
# Uncomment the following line if your adapter cannot be installed using 'npm ci'
# install-command: 'npm install'
lint: true

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: ioBroker/testing-action-adapter@v1
with:
node-version: ${{ matrix.node-version }}
os: ${{ matrix.os }}
# Uncomment the following line if your adapter cannot be installed using 'npm ci'
# install-command: 'npm install'

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x]

steps:
- name: Checkout code
uses: actions/checkout@v2

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

- name: Install Dependencies
run: npm install

- name: Lint source code
run: npm run lint
- name: Test package files
run: npm run test:package

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
if: contains(github.event.head_commit.message, '[skip ci]') == false

needs: [check-and-lint]

runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: Checkout code
uses: actions/checkout@v2

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

- name: Install Dependencies
run: npm install

- name: Run unit tests
run: npm run test:unit

- name: Run integration tests (unix only)
if: startsWith(runner.OS, 'windows') == false
run: DEBUG=testing:* npm run test:integration

- name: Run integration tests (windows only)
if: startsWith(runner.OS, 'windows')
run: set DEBUG=testing:* & npm run test:integration
# TODO: To enable automatic npm releases, create a token on npmjs.org
# 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 any branch is tagged with a version number
# if: |
# contains(github.event.head_commit.message, '[skip ci]') == false &&
# github.event_name == 'push' &&
# startsWith(github.ref, 'refs/tags/v')
#
# runs-on: ubuntu-latest
# strategy:
# matrix:
# node-version: [14.x]
#
# steps:
# - name: Checkout code
# uses: actions/checkout@v2
#
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: ${{ matrix.node-version }}
# # Deploys the final package to NPM
# deploy:
# needs: [check-and-lint, adapter-tests]
#
# - name: Extract the version and commit body from the tag
# id: extract_release
# # The body may be multiline, therefore newlines and % need to be escaped
# run: |
# VERSION="${{ github.ref }}"
# VERSION=${VERSION##*/v}
# echo "::set-output name=VERSION::$VERSION"
# BODY=$(git show -s --format=%b)
# BODY="${BODY//'%'/'%25'}"
# BODY="${BODY//$'\n'/'%0A'}"
# BODY="${BODY//$'\r'/'%0D'}"
# echo "::set-output name=BODY::$BODY"
# # Trigger this step only when a commit on any branch is tagged with a version number
# if: |
# contains(github.event.head_commit.message, '[skip ci]') == false &&
# github.event_name == 'push' &&
# startsWith(github.ref, 'refs/tags/v')
#
# - name: Publish package to npm
# run: |
# npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
# npm whoami
# npm publish
# runs-on: ubuntu-latest
#
# - name: Create Github Release
# uses: actions/create-release@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# tag_name: ${{ github.ref }}
# release_name: Release v${{ steps.extract_release.outputs.VERSION }}
# draft: false
# # Prerelease versions create prereleases on Github
# prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }}
# body: ${{ steps.extract_release.outputs.BODY }}
# steps:
# - uses: ioBroker/testing-action-deploy@v1
# with:
# node-version: '14.x'
# # Uncomment the following line if your adapter cannot be installed using 'npm ci'
# # install-command: 'npm install'
# npm-token: ${{ secrets.NPM_TOKEN }}
# github-token: ${{ secrets.GITHUB_TOKEN }}
#
# # When using Sentry for error reporting, Sentry could be informed about new releases
# # To enable create a API-Token in Sentry (User settings, API keys)
# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options
# # Then uncomment and customize the following block:
# #- name: Notify Sentry.io about the release
# # run: |
# # npm i -g @sentry/cli
# # export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
# # export SENTRY_URL=https://sentry.iobroker.net
# # export SENTRY_ORG=iobroker
# # export SENTRY_PROJECT=iobroker-ford
# # export SENTRY_VERSION=iobroker.ford@${{ steps.extract_release.outputs.VERSION }}
# # sentry-cli releases new $SENTRY_VERSION
# # sentry-cli releases finalize $SENTRY_VERSION
# # # Add the following line BEFORE finalize if repositories are connected in Sentry
# # #sentry-cli releases set-commits $SENTRY_VERSION --auto
# # # Add the following line BEFORE finalize if sourcemap uploads are needed
# # #sentry-cli releases files $SENTRY_VERSION upload-sourcemaps build/
# # When using Sentry for error reporting, Sentry can be informed about new releases
# # To enable create a API-Token in Sentry (User settings, API keys)
# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options
# # Then uncomment and customize the following block:
# sentry: true
# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }}
# sentry-project: "iobroker-mielecloudservice"
# sentry-version-prefix: "iobroker.mielecloudservice"
# # If your sentry project is linked to a GitHub repository, you can enable the following option
# # sentry-github-integration: true
10 changes: 10 additions & 0 deletions .releaseconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
// Boolean, number, string as is:
"dry": false,
// Arrays:
"plugins": ["iobroker"]
// Objects
// "exec": {
// "before_commit": "echo Hello World!"
// }
}
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ Basically there are three ways to execute the command:
## Changelog
### **WORK IN PROGRESS**

### 1.5.2 (2023-08-09)
* (grizzelbee) Fix: Adapter does not crash anymore when host isn't reachable
* (grizzelbee) Fix: Added .releaseconfig file
* (grizzelbee) Fix: Added icon to interface-device
* (grizzelbee) Fix: Some fixes to make iobroker.adapterchecker happy

### 1.5.1 (2023-08-08)
* (grizzelbee) Fix: [#65](https://github.com/Grizzelbee/ioBroker.wireguard/issues/65) No names in object tree
Expand Down
Loading

0 comments on commit bd2ab3e

Please sign in to comment.