Skip to content

Commit

Permalink
Fixed CI (#2944)
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox authored Feb 7, 2025
1 parent c880537 commit 70463cc
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 23 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ jobs:
- name: 'Build backend'
run: npm run build:backend -w packages/admin

- name: Build
run: NODE_OPTIONS=--max_old_space_size=8192 npm run build

- name: Check TypeScript files
run: |
cd packages/admin/src-admin
npm run check-ts
cd packages/admin/src-admin
npm run check-ts
# Wait till js-controller 7 types are available
continue-on-error: true

- name: Build
run: NODE_OPTIONS=--max_old_space_size=8192 npm run build

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
if: contains(github.event.head_commit.message, '[skip ci]') == false
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ The icons may not be reused in other projects without the proper flaticon licens
<!--
### **WORK IN PROGRESS**
-->
### 7.4.20 (2025-02-05)
### **WORK IN PROGRESS**
- (@GermanBluefox) Corrected the device manager in `hm-rpc` and other adapters

### 7.4.19 (2025-01-26)
Expand Down
3 changes: 1 addition & 2 deletions packages/adapter-react-v5/src/Components/Image.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { type JSX } from 'react';
import { Component } from 'react';
import React, { type JSX, Component } from 'react';

import { IconNoIcon } from '../icons/IconNoIcon';

Expand Down
1 change: 1 addition & 0 deletions packages/adapter-react-v5/src/Components/Logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export class Logo extends React.Component<LogoProps> {
if (f) {
const reader = new window.FileReader();
reader.onload = () => {
// eslint-disable-next-line @typescript-eslint/no-base-to-string
const contents: string = reader.result?.toString() || '';
try {
const json = JSON.parse(contents);
Expand Down
1 change: 1 addition & 0 deletions packages/adapter-react-v5/src/Components/Utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1715,6 +1715,7 @@ export class Utils {
const blob = await response.blob();
return new Promise(resolve => {
const reader = new FileReader();
// eslint-disable-next-line @typescript-eslint/no-base-to-string
reader.onload = (): void => resolve(reader.result?.toString() || '');
reader.readAsDataURL(blob);
});
Expand Down
13 changes: 0 additions & 13 deletions packages/admin/io-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,6 @@
"connectionType": "local",
"dataSource": "push",
"news": {
"7.4.20": {
"en": "Corrected the device manager in `hm-rpc` and other adapters",
"de": "Korrektur des Gerätemanagers in `hm-rpc` und anderen Adaptern",
"ru": "Исправлен менеджер устройства в `hm-rpc' и других адаптерах",
"pt": "Corrigido o gerenciador de dispositivos em `hm-rpc` e outros adaptadores",
"nl": "De apparaatbeheerder is gecorrigeerd in ",
"fr": "Corrigé le gestionnaire de périphérique dans `hm-rpc` et autres adaptateurs",
"it": "Corretto il gestore del dispositivo in `hm-rpc` e altri adattatori",
"es": "Corregido el administrador del dispositivo en `hm-rpc` y otros adaptadores",
"pl": "Poprawiono menedżera urządzenia w 'hm- rpc' i innych adapterach",
"uk": "Виправлено диспетчер пристроїв у `hm-rpc` та інших адаптерах",
"zh-cn": "纠正了“hm-rpc”和其他适配器中的设备管理器"
},
"7.4.19": {
"en": "Corrected file upload in File Browser and in JSON Config",
"de": "Korrigierte Datei hochgeladen in Datei Browser und in JSON Config",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/src-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@
}
]
],
"version": "7.4.19"
"version": "7.4.20"
}
2 changes: 1 addition & 1 deletion packages/admin/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ async function build() {
writeFileSync(`${__dirname}/${srcRx}public/lib/js/ace/worker-json.js`, readFileSync(`${ace}worker-json.js`));
writeFileSync(`${__dirname}/${srcRx}public/lib/js/ace/ext-searchbox.js`, readFileSync(`${ace}ext-searchbox.js`));

await buildReact(src, { rootDir: __dirname, ramSize: 7000, craco: true, exec: true });
await buildReact(src, { rootDir: __dirname, ramSize: 8192, craco: true, exec: true });
if (existsSync(`${__dirname}/adminWww/index.html`)) {
throw new Error('Front-end was not build to end!');
}
Expand Down

0 comments on commit 70463cc

Please sign in to comment.