Commit Graph

362 Commits

Author SHA1 Message Date
xilesun
d42bb722c0 Merge branch 'main' into next
Some checks are pending
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (20) (push) Waiting to run
2024-11-25 18:01:46 +08:00
xilesun
2959dd5d01 chore(ci): update 2024-11-25 18:00:20 +08:00
nocobase[bot]
dd627ab975 Merge branch 'main' into next 2024-11-25 08:04:30 +00:00
xilesun
477091aa6a chore(ci): update 2024-11-25 16:03:38 +08:00
nocobase[bot]
4c37acd5a9 Merge branch 'main' into next
Some checks failed
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (20) (push) Waiting to run
Build pro image / get-plugins (push) Has been cancelled
NocoBase backend test / sqlite-test (20, false) (push) Has been cancelled
NocoBase backend test / sqlite-test (20, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
NocoBase backend test / mysql-test (20, false) (push) Has been cancelled
NocoBase backend test / mysql-test (20, true) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, false) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, true) (push) Has been cancelled
Test on Windows / build (push) Has been cancelled
Build pro image / build-and-push (push) Has been cancelled
2024-11-24 11:28:17 +00:00
chenos
f8b686548e chore: update ci
Some checks failed
Build pro image / get-plugins (push) Has been cancelled
Deploy client docs / Build (push) Has been cancelled
E2E / Build (push) Has been cancelled
NocoBase backend test / sqlite-test (20, false) (push) Has been cancelled
NocoBase backend test / sqlite-test (20, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
NocoBase backend test / mysql-test (20, false) (push) Has been cancelled
NocoBase backend test / mysql-test (20, true) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, false) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, true) (push) Has been cancelled
NocoBase frontEnd test / frontend-test (18) (push) Has been cancelled
Test on Windows / build (push) Has been cancelled
Build pro image / build-and-push (push) Has been cancelled
E2E / Core and plugins (push) Has been cancelled
E2E / plugin-workflow (push) Has been cancelled
E2E / plugin-workflow-approval (push) Has been cancelled
E2E / plugin-data-source-main (push) Has been cancelled
E2E / Comment on PR (push) Has been cancelled
2024-11-24 19:27:43 +08:00
chenos
f9b5dba47a Merge branch 'main' into next 2024-11-22 09:59:59 +08:00
chenos
06b23bb176 chore: update ci 2024-11-22 09:58:55 +08:00
mytharcher
9dd6bd4516 Merge branch 'main' into next 2024-11-21 22:16:35 +08:00
xilesun
575460e3e9 fix(ci): release.yml 2024-11-21 22:12:45 +08:00
nocobase[bot]
8b619dea6d Merge branch 'main' into next
Some checks failed
Build pro image / get-plugins (push) Has been cancelled
Build pro image / build-and-push (push) Has been cancelled
2024-11-20 15:28:40 +00:00
chenos
f520f0c270 chore: update build ci
Some checks are pending
Build pro image / get-plugins (push) Waiting to run
Build pro image / build-and-push (push) Blocked by required conditions
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-11-20 23:28:09 +08:00
nocobase[bot]
4444e27d91 Merge branch 'main' into next 2024-11-20 13:05:03 +00:00
chenos
8195511b09 chore: update build ci 2024-11-20 21:04:29 +08:00
chenos
37b9aade1f Merge branch 'main' into next
# Conflicts:
#	.github/workflows/build-docker-image.yml
2024-11-20 13:07:44 +08:00
chenos
3dd6d6d5ef chore: update build ci 2024-11-20 12:31:10 +08:00
nocobase[bot]
ce4cd32646 Merge branch 'main' into next
Some checks failed
Build pro image / get-plugins (push) Waiting to run
Build pro image / build-and-push (push) Blocked by required conditions
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase backend test / sqlite-test (20, false) (push) Waiting to run
NocoBase backend test / sqlite-test (20, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase backend test / mysql-test (20, false) (push) Waiting to run
NocoBase backend test / mysql-test (20, true) (push) Waiting to run
NocoBase backend test / mariadb-test (20, false) (push) Waiting to run
NocoBase backend test / mariadb-test (20, true) (push) Waiting to run
NocoBase frontEnd test / frontend-test (20) (push) Waiting to run
Test on Windows / build (push) Waiting to run
Build docker image / build-and-push (push) Has been cancelled
2024-11-19 16:18:21 +00:00
chenos
b037bbe2f9 chore: update ci
Some checks failed
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (push) Waiting to run
Build pro image / build-and-push (push) Blocked by required conditions
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase backend test / sqlite-test (20, false) (push) Waiting to run
NocoBase backend test / sqlite-test (20, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase backend test / mysql-test (20, false) (push) Waiting to run
NocoBase backend test / mysql-test (20, true) (push) Waiting to run
NocoBase backend test / mariadb-test (20, false) (push) Waiting to run
NocoBase backend test / mariadb-test (20, true) (push) Waiting to run
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
Deploy client docs / Build (push) Has been cancelled
2024-11-20 00:17:51 +08:00
nocobase[bot]
1279c3ddcf Merge branch 'main' into next 2024-11-19 12:09:48 +00:00
YANG QIA
7325ffe9b0
chore(ci): update (#5688)
* test: maunal-release

* chore: update

* test: manual-release-next

* test: manual-release-develop

* chore: update
2024-11-19 20:09:29 +08:00
nocobase[bot]
8e0022c69e Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (push) Waiting to run
Build pro image / build-and-push (push) Blocked by required conditions
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase backend test / sqlite-test (20, false) (push) Waiting to run
NocoBase backend test / sqlite-test (20, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase backend test / mysql-test (20, false) (push) Waiting to run
NocoBase backend test / mysql-test (20, true) (push) Waiting to run
NocoBase backend test / mariadb-test (20, false) (push) Waiting to run
NocoBase backend test / mariadb-test (20, true) (push) Waiting to run
NocoBase frontEnd test / frontend-test (20) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-11-19 08:45:04 +00:00
YANG QIA
c1f1407cb3
chore(ci): release (#5686)
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (push) Waiting to run
Build pro image / build-and-push (push) Blocked by required conditions
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase backend test / sqlite-test (20, false) (push) Waiting to run
NocoBase backend test / sqlite-test (20, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase backend test / mysql-test (20, false) (push) Waiting to run
NocoBase backend test / mysql-test (20, true) (push) Waiting to run
NocoBase backend test / mariadb-test (20, false) (push) Waiting to run
NocoBase backend test / mariadb-test (20, true) (push) Waiting to run
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
* chore(ci): release

* fix: repositories

* fix: e2ed

* fix: e2e

* fix: e2e

* chore: update
2024-11-19 16:44:39 +08:00
nocobase[bot]
626e8ad5c4 Merge branch 'main' into next
Some checks are pending
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
2024-11-18 23:56:19 +00:00
xilesun
a63a19c8dd fix(ci): plugin-workflow-approval e2e
Some checks are pending
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
2024-11-19 07:55:50 +08:00
xilesun
9fd30b3605 Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (20) (push) Waiting to run
2024-11-19 00:38:01 +08:00
xilesun
1247f4cb63 chore(ci): update auto-merge.yml
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
Deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
2024-11-19 00:36:57 +08:00
xilesun
7b35b38087 fix(ci): typo 2024-11-18 22:32:36 +08:00
nocobase[bot]
786cb5ac3c Merge branch 'main' into next 2024-11-18 14:30:44 +00:00
YANG QIA
71d61313fd
chore(ci): update auto-merge.yml (#5679) 2024-11-18 22:30:24 +08:00
nocobase[bot]
28c8757f56 Merge branch 'main' into next 2024-11-18 14:00:37 +00:00
YANG QIA
4992af56a8
chore(ci): create-branch.yml (#5678)
* chore(ci): create branch

* fix: bug

* fix: bug

* fix: secrets

* fix: plugins

* chore: test

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update
2024-11-18 22:00:16 +08:00
nocobase[bot]
aad163c4e1 Merge branch 'main' into next 2024-11-18 04:36:25 +00:00
Katherine
ed5c6edec6
fix: linkage rule saving empty value changes to static empty value (#5667)
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
Deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run
* chore(ci): add retry

* fix:  linkage rule saving empty value changes to static empty value

---------

Co-authored-by: xilesun <2013xile@gmail.com>
2024-11-18 12:36:05 +08:00
xilesun
8836c655c1 chore(ci): update 2024-11-17 21:06:23 +08:00
nocobase[bot]
41c4919776 Merge branch 'main' into next 2024-11-16 02:37:39 +00:00
xilesun
bd3218f7cc chore(ci): add retry
Some checks failed
Build docker image / build-and-push (push) Has been cancelled
Build pro image / build-and-push (push) Has been cancelled
E2E / Build (push) Has been cancelled
NocoBase backend test / sqlite-test (20, false) (push) Has been cancelled
NocoBase backend test / sqlite-test (20, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (public, 20, public, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
NocoBase backend test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
NocoBase backend test / mysql-test (20, false) (push) Has been cancelled
NocoBase backend test / mysql-test (20, true) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, false) (push) Has been cancelled
NocoBase backend test / mariadb-test (20, true) (push) Has been cancelled
NocoBase frontEnd test / frontend-test (18) (push) Has been cancelled
Test on Windows / build (push) Has been cancelled
E2E / Core and plugins (push) Has been cancelled
E2E / plugin-workflow (push) Has been cancelled
E2E / plugin-workflow-approval (push) Has been cancelled
E2E / plugin-data-source-main (push) Has been cancelled
E2E / Comment on PR (push) Has been cancelled
2024-11-16 10:24:25 +08:00
Junyi
60225a11c5
chore(ci): change fe test based on node 20 (#5657)
* chore(ci): change fe test based on node 20

* chore(ci): change setup-node to v4

* fix(client): fix test case

* fix(client): fix test case
2024-11-15 18:12:36 +08:00
nocobase[bot]
97358707f9 Merge branch 'main' into next 2024-11-15 09:44:18 +00:00
xilesun
4daf73b76c chore(ci): update 2024-11-15 17:43:42 +08:00
nocobase[bot]
2df48e7316 Merge branch 'main' into next 2024-11-08 01:14:24 +00:00
xilesun
91b1c773a8 chore(ci): update 2024-11-08 09:13:56 +08:00
nocobase[bot]
1994566fbd Merge branch 'main' into next 2024-11-08 00:25:07 +00:00
xilesun
206d449afa fix: Dockerfile for next branch 2024-11-08 08:22:04 +08:00
nocobase[bot]
932f1c1fa5 Merge branch 'main' into next 2024-11-07 04:57:17 +00:00
xilesun
7ff194e6ec chore(ci): fix bug 2024-11-07 12:56:51 +08:00
nocobase[bot]
cd70fb4468 Merge branch 'main' into next 2024-11-07 04:24:02 +00:00
xilesun
a4c5e63634 chore(ci): update 2024-11-07 12:23:31 +08:00
nocobase[bot]
7542ae1aa2 Merge branch 'main' into next 2024-11-06 09:02:06 +00:00
xilesun
98273f1275 chore(ci): fix shell 2024-11-06 17:01:26 +08:00
nocobase[bot]
1b6cc8d0ec Merge branch 'main' into next 2024-11-06 07:35:37 +00:00