diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01902ea523edb7419fdcc00060215f03f3e27925..1dab317cb7aa3065f78ba169e2bf342e0697c17e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,3 +28,16 @@ include: - arkoala/tools/peer-generator/.gitlab-ci.yml - arkoala-arkts/.gitlab-ci.yml - interop/.gitlab-ci.yml + +#install node modules: +# stage: install-deps +# extends: +# - .linux-vm-shell-task +# before_script: +# - !reference [.setup, script] +# script: +# - npm install --no-audit --no-fund +# artifacts: +# paths: +# - node_modules +# expire_in: 1 day diff --git a/arkoala/.gitlab-ci.yml b/arkoala/.gitlab-ci.yml index 4c95239ed5320c0b5a7116df8bca5d3d603b11bb..d827e9c58cac8c1459beaf839290091649f869b3 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -15,3 +15,73 @@ install node modules (arkoala): - arkoala/rollup-plugin-ets/node_modules - arkoala/node_modules expire_in: 1 day + + arkoala.har: + stage: build + interruptible: true + extends: + - .linux-vm-shell-task + needs: + - install node modules (arkoala) + before_script: + - !reference [.setup, script] + #language=sh + script: + - npm install + - npm install --prefix arkoala + - npm install --prefix arkoala/har + - npm install --prefix arkoala/framework + - npm run arkoala:har-arm32 + artifacts: + paths: + - arkoala/har/app/arkoala/build/default/outputs/default/arkoala.har + expire_in: 1 day + + arkoala plugin: + stage: build + interruptible: true + extends: + - .linux-vm-shell-task + needs: + - install node modules (arkoala) + before_script: + - !reference [.setup, script] + #language=sh + script: + - npm install + - cd arkoala/ohos-sdk && npm run download && cd - + - export HOS_SDK_HOME="$(pwd)/arkoala/ohos-sdk/ohos-sdk" + - npm run arkoala:plugin + artifacts: + paths: + - arkoala/tools/arkoala-transformer/arkoala-plugin.js + expire_in: 1 day + + native HZVM: + stage: build + interruptible: true + extends: + - .linux-vm-shell-task + needs: + - install node modules (arkoala) + before_script: + - !reference [.setup, script] + #language=sh + script: + - npm install + - cd arkoala/ohos-sdk && npm run download && cd - + - cd incremental/compiler-plugin && npm run compile && cd - + - cd incremental && npm run compile && cd - + - cd arkoala/ets-plugin && npm run compile && cd - + - cd arkoala/rollup-plugin-ets && npm run compile && cd - + - cd arkoala/tools/arkoala-transformer && npm run compile && cd - + - cd arkoala/har && npm run --prefix ../arkui compile && cd - + - cd arkoala/har && npm run --prefix ../../incremental/compat compile:ohos && cd - + - cd arkoala/har && npm run bundle && cd - + - cd arkoala/har && npm run build && cd - + - cd arkoala/framework && npm run compile:native-hzvm-host && cd - + artifacts: + paths: + - arkoala/har/app/arkoala/build/default/outputs/default/arkoala.har + - arkoala/framework + expire_in: 1 hour diff --git a/arkoala/framework/native/meson.build b/arkoala/framework/native/meson.build index 6aed8c7e92ddd3f457a91ec9efea496a1ead1c02..4e19e3842cdd8b8d4dba5ca4af50039efc0e658b 100644 --- a/arkoala/framework/native/meson.build +++ b/arkoala/framework/native/meson.build @@ -13,8 +13,9 @@ fs = import('fs') os = target_machine.system() os = oses.get(os, os) -arch = target_machine.cpu() -arch = archs.get(arch, arch) +#arch = target_machine.cpu() +#arch = archs.get(arch, arch) +arch = 'x64' libace_name = 'ace_compatible_mock' libace_sources = [