Skip to content

Commit 81fc6d2

Browse files
Merge branch 'devel' into 5170-cb-6198-migrate-secrets-ui-public-from-backend-to-frontend-part
2 parents 8cd4006 + f41b9d2 commit 81fc6d2

File tree

319 files changed

+158
-11421
lines changed

Some content is hidden

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

319 files changed

+158
-11421
lines changed

.github/workflows/frontend-build.yml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,45 +49,26 @@ jobs:
4949
node-version: "lts/*"
5050
cache: "yarn"
5151
cache-dependency-path: |
52-
cloudbeaver/common-*/yarn.lock
5352
cloudbeaver/webapp/yarn.lock
5453
55-
- name: restore cloudbeaver-common typescript cache
56-
uses: actions/cache@v4
57-
with:
58-
path: "cloudbeaver/common-*/**/*/lib"
59-
key: ${{ runner.os }}-common-dist-${{ hashFiles('cloudbeaver/common-*/yarn.lock') }}
60-
restore-keys: |
61-
${{ runner.os }}-common-dist-
62-
6354
- name: restore typescript cache
6455
uses: actions/cache@v4
6556
with:
66-
path: "cloudbeaver/webapp/**/packages/*/dist"
57+
path: |
58+
"cloudbeaver/webapp/common-*/**/*/lib"
59+
"cloudbeaver/webapp/**/packages/*/dist"
6760
key: ${{ runner.os }}-dist-${{ hashFiles('cloudbeaver/webapp/yarn.lock') }}
6861
restore-keys: |
6962
${{ runner.os }}-dist-
7063
7164
- if: inputs.clean-cache
7265
run: yarn clear
7366

74-
- run: yarn install --immutable
75-
working-directory: ./cloudbeaver/common-typescript
76-
77-
- run: yarn install --immutable
78-
working-directory: ./cloudbeaver/common-react
79-
8067
- run: yarn install --immutable
8168

8269
- run: yarn bundle
8370
working-directory: ./cloudbeaver/webapp/packages/product-default
8471

85-
- run: yarn test
86-
working-directory: ./cloudbeaver/common-typescript
87-
88-
- run: yarn test
89-
working-directory: ./cloudbeaver/common-react
90-
9172
- run: yarn test
9273

9374
# - name: Archive build artifacts

.github/workflows/frontend-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
cache-dependency-path: "./cloudbeaver/webapp/yarn.lock"
3131

3232
# - run: yarn install --immutable
33-
# working-directory: ./cloudbeaver/common-typescript
33+
# working-directory: ./cloudbeaver/webapp/common-typescript
3434

3535
# - run: yarn install --immutable
36-
# working-directory: ./cloudbeaver/common-react
36+
# working-directory: ./cloudbeaver/webapp/common-react
3737

3838
- run: |
3939
yarn install --immutable

.vscode/tasks.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"group": "test",
2727
"args": ["test"],
2828
"options": {
29-
"cwd": "${workspaceFolder}/common-typescript"
29+
"cwd": "${workspaceFolder}/webapp/common-typescript"
3030
}
3131
},
3232
{
@@ -36,7 +36,7 @@
3636
"group": "test",
3737
"args": ["test"],
3838
"options": {
39-
"cwd": "${workspaceFolder}/common-react"
39+
"cwd": "${workspaceFolder}/webapp/common-react"
4040
}
4141
},
4242
{
@@ -133,7 +133,7 @@
133133
"type": "shell",
134134
"command": "yarn",
135135
"options": {
136-
"cwd": "${workspaceFolder}/common-react/@dbeaver/ui-kit"
136+
"cwd": "${workspaceFolder}/webapp/common-react/@dbeaver/ui-kit"
137137
},
138138
"args": ["docs"]
139139
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)