Skip to content

Commit 6bd0568

Browse files
zhangzhonghechenos
andauthoredDec 18, 2023
chore: upgrade antd to v5.12.2 (nocobase#3185)
* chore: upgrade antd to v5.12.2 * refactor: rename to StablePopover * fix: fix tests * test: fix e2e * chore(CI): optimize E2E workflow * chore: fix playwright * fix: re-generate yarn.lock to fix e2e errors * test: update locator * fix: fix build errors * fix: fix unit tests * fix: fix e2e tests * fix: should not auto close when clicking menu item * fix: fix column width * test: increase e2e timeout-minutes to 90 * test: fix e2e * fix: update dockerfile * fix: npmignore * fix: app component false --------- Co-authored-by: chenos <[email protected]>
1 parent c2d95a1 commit 6bd0568

File tree

46 files changed

+8042
-5123
lines changed

Some content is hidden

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

46 files changed

+8042
-5123
lines changed
 

‎.github/workflows/nocobase-test-e2e.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,17 @@ jobs:
4343
uses: actions/setup-node@v3
4444
with:
4545
node-version: ${{ matrix.node_version }}
46+
cache: 'yarn'
4647
- name: Get yarn cache directory path
4748
id: yarn-cache-dir-path
4849
run: echo "::set-output name=dir::$(yarn cache dir)"
4950

5051
- uses: actions/cache@v3
5152
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
5253
with:
53-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
54+
path: |
55+
${{ steps.yarn-cache-dir-path.outputs.dir }}
56+
**/node_modules
5457
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
5558
restore-keys: |
5659
${{ runner.os }}-yarn-
@@ -60,7 +63,7 @@ jobs:
6063
run: yarn build
6164
env:
6265
__E2E__: true
63-
- run: npx playwright install --with-deps
66+
- run: npx playwright install chromium --with-deps
6467
- name: Test with postgres
6568
run: yarn e2e test -x --skip-reporter
6669
env:
@@ -73,7 +76,4 @@ jobs:
7376
DB_USER: nocobase
7477
DB_PASSWORD: password
7578
DB_DATABASE: nocobase
76-
DB_UNDERSCORED: ${{ matrix.underscored }}
77-
DB_SCHEMA: ${{ matrix.schema }}
78-
COLLECTION_MANAGER_SCHEMA: ${{ matrix.collection_schema }}
7979
timeout-minutes: 90

‎Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ RUN cd /tmp && \
1818
RUN yarn install && yarn build --no-dts
1919
2020
RUN git checkout -b release-$(date +'%Y%m%d%H%M%S') \
21-
&& yarn version:alpha -y \
22-
&& git config user.email "test@mail.com" \
21+
&& yarn version:alpha -y
22+
RUN git config user.email "test@mail.com" \
2323
&& git config user.name "test" && git add . \
24-
&& git commit -m "chore(versions): test publish packages xxx" \
25-
&& yarn release:force --registry $VERDACCIO_URL
24+
&& git commit -m "chore(versions): test publish packages"
25+
RUN yarn release:force --registry $VERDACCIO_URL
2626
2727
RUN yarn config set registry $VERDACCIO_URL
2828
WORKDIR /app

0 commit comments

Comments
 (0)
Please sign in to comment.