Skip to content

Commit 48d0f8a

Browse files
Fixing publishing (#2076)
* Fixing publishing * Fixing publishing * Fixing publishing * Fixing linter * Fixing linter
1 parent 5498866 commit 48d0f8a

File tree

84 files changed

+25885
-1426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+25885
-1426
lines changed

.github/workflows/test-and-release.yml

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,58 +29,37 @@ jobs:
2929
runs-on: ubuntu-latest
3030

3131
steps:
32-
- uses: actions/checkout@v6
33-
- name: Use Node.js ${{ matrix.node-version }}
34-
uses: actions/setup-node@v6
32+
- uses: ioBroker/testing-action-check@v1
3533
with:
36-
node-version: 20.x
37-
38-
- name: Install Dependencies
39-
run: npm install
40-
41-
# - name: Perform a type check
42-
# run: npm run check:ts
43-
# env:
44-
# CI: true
45-
# - name: Lint TypeScript code
46-
# run: npm run lint
47-
# - name: Test package files
48-
# run: npm run test:package
34+
node-version: '22.x'
35+
lint: true
4936

5037
build:
5138
runs-on: ubuntu-latest
5239
steps:
5340
- uses: actions/checkout@v6
5441
- uses: actions/setup-node@v6
5542
with:
56-
node-version: 20.x
43+
node-version: 22.x
5744
- run: npm i
5845
- run: npm run build
5946

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

64-
needs: [check-and-lint, build]
52+
needs: [check-and-lint]
6553

66-
runs-on: ${{ matrix.os }}
54+
runs-on: ubuntu-latest
6755
strategy:
6856
matrix:
6957
node-version: [18.x, 20.x, 22.x, 24.x]
70-
os: [ubuntu-latest, windows-latest, macos-latest]
7158

7259
steps:
73-
- uses: actions/checkout@v6
74-
- name: Use Node.js ${{ matrix.node-version }}
75-
uses: actions/setup-node@v6
60+
- uses: ioBroker/testing-action-adapter@v1
7661
with:
77-
node-version: ${{ matrix.node-version }}
78-
79-
- name: Install Dependencies
80-
run: npm install
81-
82-
- name: Run local tests
83-
run: npm test
62+
build: true
8463

8564
# Merges and deploys the final package to NPM
8665
auto-merge:
@@ -90,6 +69,10 @@ jobs:
9069
always() &&
9170
github.event_name == 'pull_request'
9271
runs-on: ubuntu-latest
72+
permissions:
73+
contents: write
74+
id-token: write
75+
9376
steps:
9477
- id: automerge
9578
name: automerge
@@ -140,17 +123,15 @@ jobs:
140123
141124
- name: Install Dependencies
142125
if: steps.automerge.outputs.mergeResult == 'merged'
143-
run: npm install
126+
run: npm ci
144127

145128
- name: Build
146129
if: steps.automerge.outputs.mergeResult == 'merged'
147130
run: npm run build
148131

149-
# The prepublish script also creates a build
150132
- name: Publish package to npm
151133
if: steps.automerge.outputs.mergeResult == 'merged'
152134
run: |
153-
npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
154135
npm whoami
155136
npm publish
156137

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ _admin
55
iob_npm.dode
66
/nbproject
77
/src/blockly
8-
/src/package-lock.json
9-
package-lock.json
108
/src/.eslintcache
119

1210

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

admin/assets/ScriptEditorVanillaMonaco-ClbMWGdO.js renamed to admin/assets/ScriptEditorVanillaMonaco-D7YWFnFw.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

admin/assets/hostInit-OBG53iVO.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 45 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)