Skip to content

Commit

Permalink
Merge pull request #113 from DrozmotiX/genericCoreDependencyUpdates
Browse files Browse the repository at this point in the history
Generic core dependency updates
  • Loading branch information
DutchmanNL authored Oct 26, 2024
2 parents fd28f98 + 2d7d5fd commit 65cffc5
Show file tree
Hide file tree
Showing 8 changed files with 4,381 additions and 10,416 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.prettierrc.js
**/.eslintrc.js
**/.eslintrc.js
admin/words.js
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
"semi": ["error", "always"]
},
"parserOptions": {
"ecmaVersion": 2020
"ecmaVersion": "latest"
}
}
52 changes: 52 additions & 0 deletions .github/workflows/branch-test-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
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: {}

# Cancel previous PR/branch runs when a new commit is pushed
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
# 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: '20.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: [18.x, 20.x, 22.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'
2 changes: 1 addition & 1 deletion .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
node-version: [16.x, 18.x, 20.x, 22.X]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
Expand Down
13 changes: 12 additions & 1 deletion admin/jsonConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"value": "X1-Series"
}
],
"default": "X1",
"default": "P1-Series",
"help": "Please select your printer model"
},
"requestInterval": {
Expand All @@ -51,6 +51,17 @@
"default": 5,
"min" : 1,
"max": 36000
},

"getDataFiles" : {
"newLine": true,
"type": "fileSelector",
"upload": "/",
"label": "Upload g-code file",
"help": "Here you can upload files, like g-code, to send to the printer",
"sm": 3,
"md": 3,
"lg": 3
}
}
}
9 changes: 7 additions & 2 deletions io-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
"bambulab",
"3d-printing"
],
"license": "MIT",
"platform": "Javascript/Node.js",
"main": "main.js",
"icon": "bambulab.png",
Expand All @@ -153,7 +152,13 @@
{
"admin": ">=5.1.13"
}
]
],
"tier": 3,
"licenseInformation": {
"license": "MIT",
"link": "https://github.com/DrozmotiX/ioBroker.bambulab/blob/main/LICENSE",
"type": "free"
}
},
"encryptedNative": [
"Password",
Expand Down
Loading

0 comments on commit 65cffc5

Please sign in to comment.