Commit Graph

283 Commits

Author SHA1 Message Date
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
xilesun
49cba46c56 fix(ci): release.yml 2024-11-06 15:35:07 +08:00
nocobase[bot]
3d71f3a1a6 Merge branch 'main' into next 2024-11-06 06:46:28 +00:00
xilesun
60d44538f0 fix(ci): release.yml 2024-11-06 14:46:04 +08:00
nocobase[bot]
acf019a0b2 Merge branch 'main' into next 2024-11-06 06:40:28 +00:00
xilesun
3191a946a8 fix(ci): changelog-and-release.yml 2024-11-06 14:34:25 +08:00
nocobase[bot]
6d70cf74fe Merge branch 'main' into next 2024-11-06 06:12:48 +00:00
YANG QIA
abda8f77df
chore(ci): manual release next (#5600)
* chore(ci): manual release next

* fix: branch

* chore: update
2024-11-06 14:11:48 +08:00
Zeke Zhang
f6fd8152cc Merge branch 'main' into next 2024-10-30 18:02:02 +08:00
xilesun
7f83dad158 chore(ci): update 2024-10-30 13:47:01 +08:00
nocobase[bot]
8fbf87024a Merge branch 'main' into next 2024-10-28 11:12:14 +00:00
xilesun
5947ac2502 chore(ci): optimize name 2024-10-28 19:11:45 +08:00
nocobase[bot]
cb74d711d4 Merge branch 'main' into next 2024-10-28 08:27:33 +00:00
xilesun
8e16695bff fix(ci): bug 2024-10-28 16:27:09 +08:00
gchust
2e7a21d1d2
chore: update pro image (#5513)
* chore: update pg client to 17 in pro docker image

* chore: update ci to use pro image
2024-10-25 14:17:01 +08:00
ChengLei Shao
a7f964988b
fix: update association with a non-primary key table (#5495)
* fix: update association with non primaryKey table

* fix: test

* fix: test

* fix: get primary key attribute with multi filter target keys

* fix: update has one associations

* fix: test

* fix: test

* chore: test

* chore: test

* chore: test

* chore: test

* chore: middleware

* chore: error condition

* chore: test

* fix: test
2024-10-25 07:21:07 +08:00
nocobase[bot]
1f7f4a8f9c Merge branch 'main' into next 2024-10-24 03:13:19 +00:00
xilesun
e13a5de904 fix(ci): typo 2024-10-24 11:12:51 +08:00
mytharcher
9548bebe2a 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 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
2024-10-24 09:35:53 +08:00
YANG QIA
48f1827f94
chore(ci): optimize (#5501)
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 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): optimize

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update
2024-10-23 23:36:10 +08:00
chenos
8e5cbee162 chore: update ci 2024-10-23 12:03:02 +08:00
nocobase[bot]
cd7abe02f8 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 (18) (push) Waiting to run
2024-10-21 12:47:37 +00:00
xilesun
03d7a67999 chore(ci): fix changelog-and-release.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 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
2024-10-21 20:47:06 +08:00
chenos
eda732ef5f
chore: upgrade appleboy/scp-action (#5461)
* chore: upgrade appleboy/scp-action

* fix: build
2024-10-20 10:47:01 +08:00
nocobase[bot]
35b64881da 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 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
2024-10-18 05:29:48 +00:00
YANG QIA
aab4ba5874
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-10-18 13:29:25 +08:00
nocobase[bot]
976a5d6da7 Merge branch 'main' into next 2024-10-18 05:02:04 +00:00
xilesun
c208ddbbb9 fix(ci): typo 2024-10-18 13:01:37 +08:00
nocobase[bot]
30652fe325 Merge branch 'main' into next 2024-10-18 04:58:14 +00:00
xilesun
28612eb57c chore(ci): update auto-merge.yml 2024-10-18 12:57:45 +08:00
nocobase[bot]
68cea3470e Merge branch 'main' into next 2024-10-18 02:31:25 +00:00
xilesun
495dde46ab chore(ci): optimize 2024-10-18 10:30:58 +08:00
nocobase[bot]
6219bcbac5 Merge branch 'main' into next 2024-10-13 04:09:00 +00:00
xilesun
0d4e2237b8 chore(ci): fix permissions 2024-10-13 12:08:35 +08:00
nocobase[bot]
e862b5a95e Merge branch 'main' into next 2024-10-13 04:04:16 +00:00
YANG QIA
8f726979a7
chore(ci): optimize (#5403)
* chore(ci): optimize

* fix: bug

* fix: bug

* chore: update

* fix: url
2024-10-13 11:30:54 +08:00
GitHub Actions Bot
11017da282 Merge branch 'main' into next 2024-10-10 10:30:51 +00:00
xilesun
5084b8ed31 chore(ci): fix typo 2024-10-10 18:30:21 +08:00
GitHub Actions Bot
a7cad8c652 Merge branch 'main' into next 2024-10-10 10:24:32 +00:00
xilesun
3ad0f0bb05 chore(ci): fix condition 2024-10-10 18:24:08 +08:00
GitHub Actions Bot
a51f6be832 Merge branch 'main' into next 2024-10-10 10:16:30 +00:00
xilesun
25a52578c3 chore(ci): update 2024-10-10 18:16:04 +08:00
GitHub Actions Bot
d63d5567e0 Merge branch 'main' into next 2024-10-10 02:53:23 +00:00
xilesun
744d97c9b4 chore(ci): update
Some checks are pending
auto-merge / push-commit (push) Waiting to run
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 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
2024-10-10 10:52:54 +08:00
ChengLei Shao
8b9acde16a
chore: start up scripts in docker (#5361)
Some checks failed
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 (18) (push) Waiting to run
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
* chore: start up scripts

* fix: build image

* fix: commit hash

* chore: dockerfile

* chore: dockerfile

* chore: dockerfile
2024-10-09 19:06:42 +08:00
GitHub Actions Bot
36aad29a37 Merge branch 'main' into next 2024-10-09 07:32:02 +00:00
GitHub Actions Bot
9015770784 Merge branch 'main' into next 2024-10-09 07:21:33 +00:00
xilesun
39ab5d8350 chore(ci): fix token issue 2024-10-09 15:21:32 +08:00