Commit Graph

88 Commits

Author SHA1 Message Date
PP 549108d018 support bundle-adapter workflow (#11337)
* update require

* support bundle-adapter workflow

update

* update adapter require

* add timer

* update

* update lock

update lock

* remove node version for npm test CI

* with node version 16.15

* install jsdom

* use 16.15
2022-06-08 12:47:23 +08:00
江战 952bf07ff5 3.6 sebind impl (#11125) 2022-05-25 11:17:36 +08:00
minggo 7814949998 Merge branch 'v3.5.1' into v3.6.0_merge_v3.5.1 2022-05-24 11:53:57 +08:00
江战 b6dce18eee Revert "update clang-tidy (#10989)" (#11010)
This reverts commit a573bdc027.
2022-05-10 10:24:36 +08:00
江战 a573bdc027 update clang-tidy (#10989) 2022-05-07 15:34:49 +08:00
minggo 255e4c9dfb [skip ci]Remove unneeded codes (#10917)
* remove unneeded code
2022-04-29 16:37:44 +08:00
minggo d64458abf4 remove unneeded files (#10911)
* remove unneeded files
2022-04-29 11:20:44 +08:00
bofeng-song d568aa9ec0 upgrade gradle pulgin version to fix can not find d8 file(build-tools) (#10907) 2022-04-28 16:29:42 +08:00
Leslie Leigh (李的序) 844975878d Circular references should cause workflow failed (#10841) 2022-04-25 21:16:43 +08:00
minggo 84c27e7f71 Merge branch 'v3.5.0' into v3.6.0_merge_v3.5 2022-04-24 13:41:27 +08:00
bofeng-song ef7d80f8ae integrate game-activity (#10794) 2022-04-22 13:48:43 +08:00
Santy-Wang 3da31ad481 move templates (#10781)
* move templates

* adjust github action

* adjust access authority
2022-04-18 10:24:54 +08:00
江战 4efa771d35 3.5 add cmake hooks support for cocos-service (#10691) 2022-04-08 13:44:57 +08:00
江战 e02b03ac4c 3.6 add linux ci (#10636)
* 3.6 add linux ci
2022-04-01 18:53:52 +08:00
江战 72ec812b33 V3.5 add linux ci (#10600)
* add linux ci
2022-03-31 14:30:32 +08:00
minggo e849e9cd7e fix compiling and crash error 2022-03-31 14:21:06 +08:00
minggo a6bf766170 Merge branch 'v3.5.0' into v3.6_merge_v3.5 2022-03-29 18:26:40 +08:00
pandamicro d3f5e58acc Fix templates and minor tweaks (#10434)
* Fix templates

* Minor tweaks

* Minor
2022-03-22 17:22:41 +08:00
fish9167 3f7bf72131 v3.6.0 sync Github Action (#10367)
* Update native-simulator.yml

更新 windows 镜像版本
限制任务触发条件(native 目录下有文件修改才会触发该任务)

* Update native-compile-platforms.yml

更新 windows 镜像版本
限制任务触发条件(native 目录下有文件修改才会触发该任务)

* change Visual Studio version

修改 Visual Studio 版本(2017-->2019)

* Update native-clang-format.yml

仓库地址修改

* Update automation_labels.yml

组织名称修改
2022-03-16 16:37:22 +08:00
fish9167 82cd89d260 Update native-compile-platforms.yml (#10362)
* Update native-compile-platforms.yml

更新 windows 镜像版本
限制任务触发条件(native 目录下有文件修改才会触发该任务)

* Update automation_labels.yml

组织名称修改

* change Visual Studio version

修改 Visual Studio 版本(2017-->2019)

* Update native-simulator.yml

更新 windows 镜像版本
限制任务触发条件(native 目录下有文件修改才会触发该任务)
2022-03-16 16:00:23 +08:00
江战 7c3698dca0 3.6 Update layout_foot.h (#10289)
* Update layout_foot.h

* fix clang-foramt dir
2022-03-10 09:52:11 +08:00
timlyeee 8f53542267 fix win64 restart crash (#10233)
* fix win64 restart crash

* supply restart fix from v3.4.2/v3.5(supply a default context)
* temp hack for v8::Arraybuffer(abi conflict).
* remove use of windows dll for x86
2022-03-09 16:07:24 +08:00
minggo 73c303f556 Merge branch 'v3.5.0' into merge_v3.5.0 2022-03-08 14:53:00 +08:00
江战 58dd778029 3.6 update clang-format version (#10217) 2022-03-01 18:36:34 +08:00
fish9167 2c8fab0b89 Update native_compile_self.yml (#10219)
修改任务触发条件,native 目录下的文件发送改变才触发任务
2022-03-01 18:21:09 +08:00
James Chen 3c5ee10731 [v3.6] Move native/external/config.json to native/external-config.json (#10207)
* Move native/external/config.json to native/external-config.json

* Update CI config.

* Update native/utils/download-deps.js

* Update native/tools/make-package/config.json

* Remove native/.github
2022-03-01 10:34:56 +08:00
James Chen c24d75e115 [v3.5.0] Move native/external/config.json to native/external-config.json (#10208)
* Move native/external/config.json to native/external-config.json

* Update CI config.

* Update native/utils/download-deps.js

* Remove native/.github
2022-03-01 10:34:35 +08:00
pandamicro 1446db89e7 Merge branch 'v3.4.2' into v3.5.0
# Conflicts:
#	cocos/2d/components/sprite.ts
#	cocos/2d/framework/ui-transform.ts
#	cocos/2d/renderer/render-uniform-buffer.ts
#	cocos/core/builtin/effects.ts
#	cocos/core/builtin/shader-sources/glsl1.ts
#	cocos/core/builtin/shader-sources/glsl3.ts
#	cocos/core/builtin/shader-sources/glsl4.ts
#	cocos/dragon-bones/ArmatureDisplay.ts
#	cocos/spine/skeleton.ts
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk
#	editor/assets/chunks/cc-sprite-fs-gpu.chunk.meta
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk
#	editor/assets/chunks/cc-sprite-vs-gpu.chunk.meta
#	editor/assets/default_skybox.meta
#	editor/assets/effects/builtin-sprite-gpu.effect.meta
2022-02-28 17:24:02 +08:00
fish9167 6daf4256fe Rename native_compile_self.yal to native_compile_self.yml (#10187)
* Rename native_compile_self.yal to native_compile_self.yml

文件后缀名修改(不然无法运行GitHub action任务)

* Update native_compile_self.yml

* Update native_compile_self.yml

修改 native 对应目录

* Update native_compile_self.yml

native 对应目录修改

* Update native_compile_self.yml

修改 对应的 native 目录

* Update native_compile_self.yml

修改对应 native 目录
2022-02-25 18:13:02 +08:00
fish9167 de9ed24e78 ADD GitHub Action (#10173)
* ADD GitHub Action

使用私有机器进行编译(windows,Android)

* Update native_compile_self.yal

修改任务名称

* Update native-clang-format.yml

仓库地址修改
2022-02-25 10:49:54 +08:00
江战 a5299e38d4 3.6 auto gen builtin res (#10162)
* CI run builtin-res generation
2022-02-23 17:35:29 +08:00
江战 c3bfc1f439 fix function block (#10147) 2022-02-22 16:23:51 +08:00
江战 ab939cefdf Update native-unit-test.yml (#10130)
* Update native-unit-test.yml
2022-02-21 11:49:00 +08:00
江战 a4fc0a8513 Update native-unit-test.yml (#10116) 2022-02-16 15:35:12 +08:00
timlyeee d2e4b75463 Fix loop audio would stop for ios system (#10094)
* Fix loop audio would stop for ios system

* IOS system has an uncertain state between foreground and background, and our condition sometimes miss the point to load buffers.
* Queue for 3 buffers might be too short to live, use 4 or even more instead.
* Issue could be solved: 
* https://github.com/cocos2d/cocos2d-x/issues/19480, 
* https://github.com/cocos-creator/3d-tasks/issues/11135
2022-02-16 11:59:03 +08:00
PP f0b1b9aa26 fix interface checking (#10109) 2022-02-15 17:41:03 +08:00
James Chen f34301fb88 [3.5] Update ci yml files, add native/web prefix, cherry-pick from #10083 (#10104)
* Update ci yml files, add native/web prefix (#10083)

* Update ci yml files, add native/web prefix

* Update native-compile-platform.yml

* Update CMakeLists.header.txt & generate_compile_command_android.sh

* Fix wrong path in filter_by_cdb.js
2022-02-15 09:55:48 +08:00
James Chen b21fc18f23 Update ci yml files, add native/web prefix (#10083)
* Update ci yml files, add native/web prefix

* Update native-compile-platform.yml

* Update CMakeLists.header.txt & generate_compile_command_android.sh
2022-02-12 11:09:48 +08:00
shaoqiangcai 5802595178 Update bindings.yml (#10074)
调整fork仓库
2022-02-11 14:50:19 +08:00
shaoqiangcai 414216b02f Update bindings.yml (#10075)
调整3.6.0的fork地址
2022-02-11 14:49:02 +08:00
dumganhar 550cbffea8 Add github action for native platforms. 2022-02-09 17:31:33 +08:00
santy-wang 995f5b2d41 Merge branch 'v3.4.2' of https://gitlab.cocos.net/publics/engine into v3.5-merge 2022-01-24 15:56:49 +08:00
shaoqiangcai e7429e59da Update run_test_cases.yml (#10030)
添加PR-Test到3.5.0的分支
2022-01-21 11:30:50 +08:00
fish9167 1a06791908 change gitbub action trigger event (#9973)
修改任务触发方式
2022-01-12 15:38:03 +08:00
fish0607 39c2c64b01 修改任务触发方式 (#9956)
修改任务触发方式(@cocos-robot run test cases)
2022-01-11 17:49:05 +08:00
PP f278c43206 fix cc_base.d.ts (#9944)
* fix cc_base.d.ts

* update
2022-01-07 11:33:43 +08:00
PP 9b052b31a5 use git clean -xfd (#9943) 2022-01-07 11:00:54 +08:00
santy-wang 7ffe1bc031 Merge branch 'v3.4.1' of https://gitlab.cocos.net/publics/engine into v3.5.0 2022-01-06 14:41:28 +08:00
fish9167 5ffe5aee23 Add GitHub Action (#9872)
* Add GitHub Action

Add GitHub Action: run test cases

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

retry github action

* Update run_test_cases.yml

updata npm

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

* Update run_test_cases.yml

retry github action

* Update run_test_cases.yml
2021-12-28 11:08:31 +08:00
santy-wang d3d84673d3 Merge branch 'v3.4.0' of https://gitlab.cocos.net/publics/engine into v3.5.0 2021-12-10 19:20:01 +08:00