Skip to content

Commit

Permalink
Merge pull request #81 from skbkontur/semke/fix-build
Browse files Browse the repository at this point in the history
Semke/fix build
  • Loading branch information
semkedaniil authored Nov 22, 2023
2 parents 7e5f6c7 + 856bb7d commit 008fe98
Show file tree
Hide file tree
Showing 8 changed files with 3,103 additions and 3,960 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
DOTNET_VERSION: 6.0.x
NODE_VERSION: 16
NODE_VERSION: 20
NPM_REGISTRY: https://registry.npmjs.org

jobs:
Expand All @@ -31,8 +31,11 @@ jobs:
- name: Install dependencies
run: dotnet restore ./DbViewer.sln --verbosity minimal && dotnet tool restore

- name: Install yarn
run: corepack enable && corepack prepare yarn@4.0.2 --activate

- name: Install node dependencies
run: cd ./db-viewer-ui && yarn set version berry && yarn install --immutable
run: corepack yarn --cwd db-viewer-ui --immutable

- name: Pull docker images
run: docker pull selenoid/vnc:chrome_112.0
Expand Down Expand Up @@ -102,6 +105,12 @@ jobs:
node-version: ${{ env.NODE_VERSION }}
registry-url: ${{ env.NPM_REGISTRY }}

- name: Install yarn
run: corepack enable && corepack prepare yarn@4.0.2 --activate

- name: Install node dependencies
run: corepack yarn --cwd db-viewer-ui --immutable

- name: Check version
run: |
tagName="${{github.ref_name}}"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## v1.7 - 2023.11.22
- Update yarn to v4
- Update node to v20
- Fix build error

## v1.6 - 2023.10.13
- Update yarn to v3
- Change webpack to vite
Expand Down
874 changes: 0 additions & 874 deletions db-viewer-ui/.yarn/releases/yarn-3.6.4.cjs

This file was deleted.

6 changes: 4 additions & 2 deletions db-viewer-ui/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
compressionLevel: mixed

enableGlobalCache: false

networkConcurrency: 16

nodeLinker: node-modules

npmRegistryServer: "https://registry.npmjs.org"

yarnPath: .yarn/releases/yarn-3.6.4.cjs
2 changes: 1 addition & 1 deletion db-viewer-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,5 @@
"vite": "^4.4.9",
"vitest": "^0.30.1"
},
"packageManager": "yarn@3.6.4"
"packageManager": "yarn@4.0.2+sha256.825003a0f561ad09a3b1ac4a3b3ea6207af2796d54f62a9420520915721f5186"
}
1 change: 1 addition & 0 deletions db-viewer-ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"forceConsistentCasingInFileNames": true,
"moduleResolution": "Node",
"resolveJsonModule": true,
"esModuleInterop": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
Expand Down
Loading

0 comments on commit 008fe98

Please sign in to comment.