Skip to content

Commit 488d3b9

Browse files
committed
Merge remote-tracking branch 'origin/main' into upgrade_to_mui_v6
Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com> # Conflicts: # package-lock.json # package.json
2 parents de60572 + 21bf567 commit 488d3b9

33 files changed

+548
-392
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
uses: powsybl/github-ci/.github/workflows/build-frontend-app-generic.yml@aaae75875296657028f2805e7a3fbdb1418b8b95
11+
uses: powsybl/github-ci/.github/workflows/build-frontend-app-generic.yml@b0f6bbfe2ebaf08ac8f5e4f1220e13cb05c24de2
1212
with:
1313
dockerImage: gridsuite/gridadmin-app
1414
dockerUsername: gridsuiteci

.github/workflows/patch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
run-patch:
13-
uses: powsybl/github-ci/.github/workflows/patch-frontend-app-generic.yml@aaae75875296657028f2805e7a3fbdb1418b8b95
13+
uses: powsybl/github-ci/.github/workflows/patch-frontend-app-generic.yml@b0f6bbfe2ebaf08ac8f5e4f1220e13cb05c24de2
1414
with:
1515
releaseVersion: ${{ github.event.inputs.releaseVersion }}
1616
dockerImage: docker.io/gridsuite/gridadmin-app

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
run-release:
17-
uses: powsybl/github-ci/.github/workflows/release-frontend-app-generic.yml@aaae75875296657028f2805e7a3fbdb1418b8b95
17+
uses: powsybl/github-ci/.github/workflows/release-frontend-app-generic.yml@b0f6bbfe2ebaf08ac8f5e4f1220e13cb05c24de2
1818
with:
1919
releaseVersion: ${{ github.event.inputs.releaseVersion }}
2020
commitSha: ${{ github.event.inputs.gitReference }}

eslint.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ const projectConfig = [
181181
'@typescript-eslint/consistent-type-definitions': 'off',
182182
'@typescript-eslint/no-empty-object-type': 'off',
183183
'@typescript-eslint/no-shadow': 'off',
184-
'@typescript-eslint/no-unused-vars': 'off',
185184
'@typescript-eslint/no-use-before-define': 'off',
186185
'@typescript-eslint/no-unsafe-function-type': 'off',
187186

0 commit comments

Comments
 (0)