From e3a31c9b0f170bd4c2b17d90baf1ad0b9a4e4256 Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Mon, 16 Dec 2024 16:29:45 +0300 Subject: [PATCH 1/9] Initial commit Disable rules for testing purposes --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01902ea52..bdc82d839 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,10 +10,10 @@ stages: - idlize - build-with-idlize -workflow: - rules: - - if: $CI_PIPELINE_SOURCE == "pipeline" - - if: $CI_PIPELINE_SOURCE == "parent_pipeline" +#workflow: +# rules: +# - if: $CI_PIPELINE_SOURCE == "pipeline" +# - if: $CI_PIPELINE_SOURCE == "parent_pipeline" include: - gitlab/setup.yml -- Gitee From 44afdd6c717f1d9b7f9efb565271f3302089f7ac Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Mon, 16 Dec 2024 16:51:48 +0300 Subject: [PATCH 2/9] Restore rules Restore rules --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdc82d839..01902ea52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,10 +10,10 @@ stages: - idlize - build-with-idlize -#workflow: -# rules: -# - if: $CI_PIPELINE_SOURCE == "pipeline" -# - if: $CI_PIPELINE_SOURCE == "parent_pipeline" +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == "pipeline" + - if: $CI_PIPELINE_SOURCE == "parent_pipeline" include: - gitlab/setup.yml -- Gitee From affa4c446a13bd59ca5ef067fc94884d6b26cc90 Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Mon, 16 Dec 2024 17:31:33 +0300 Subject: [PATCH 3/9] Add job Add test job --- .gitlab-ci.yml | 13 +++++++++++++ arkoala/.gitlab-ci.yml | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01902ea52..1dab317cb 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 4c95239ed..e91dd2596 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -15,3 +15,15 @@ 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] + script: + - npm run arkoala:har-arm32 -- Gitee From 5673f56549e1d77d820ea362297dfc11f6f0cd54 Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Mon, 16 Dec 2024 18:08:29 +0300 Subject: [PATCH 4/9] Update job Add install call --- arkoala/.gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arkoala/.gitlab-ci.yml b/arkoala/.gitlab-ci.yml index e91dd2596..1ca83b227 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -26,4 +26,8 @@ install node modules (arkoala): before_script: - !reference [.setup, script] script: + - npm install + - npm install --prefix arkoala + - npm install --prefix arkoala/har + - npm install --prefix arkoala/framework - npm run arkoala:har-arm32 -- Gitee From 7f7be979ce1aed0bff325bd24b1c50836f3ffe2a Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Mon, 16 Dec 2024 19:02:52 +0300 Subject: [PATCH 5/9] Add job Build plugin --- arkoala/.gitlab-ci.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arkoala/.gitlab-ci.yml b/arkoala/.gitlab-ci.yml index 1ca83b227..edda3bf00 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -25,9 +25,34 @@ install node modules (arkoala): - 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 + - npm run ohos-sdk + - export HOS_SDK_HOME="$(pwd)/arkoala/ohos-sdk/ohos-sdk" + - npm run arkoala:plugin + artifacts: + paths: + - ${HOS_SDK_HOME}/HarmonyOS-NEXT-DB1/openharmony/ets/build-tools/ets-loader/lib/fast_build/ets_ui/arkoala-plugin.js + expire_in: 1 day -- Gitee From 04fb6c6de79477693d35b29f8311894c0dbca1f0 Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Mon, 16 Dec 2024 20:08:17 +0300 Subject: [PATCH 6/9] Fix path Fix SDK location --- arkoala/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala/.gitlab-ci.yml b/arkoala/.gitlab-ci.yml index edda3bf00..e0a298629 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -50,7 +50,7 @@ install node modules (arkoala): script: - npm install - npm run ohos-sdk - - export HOS_SDK_HOME="$(pwd)/arkoala/ohos-sdk/ohos-sdk" + - export HOS_SDK_HOME="$(pwd)/arkoala/arkui-common/ohos-sdk-ets" - npm run arkoala:plugin artifacts: paths: -- Gitee From 62e815661026eaddd93c4d1c3ea13885e12b557c Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Tue, 17 Dec 2024 14:13:39 +0300 Subject: [PATCH 7/9] Add new job Add linux job --- arkoala/.gitlab-ci.yml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/arkoala/.gitlab-ci.yml b/arkoala/.gitlab-ci.yml index e0a298629..b66403f6d 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -54,5 +54,32 @@ install node modules (arkoala): - npm run arkoala:plugin artifacts: paths: - - ${HOS_SDK_HOME}/HarmonyOS-NEXT-DB1/openharmony/ets/build-tools/ets-loader/lib/fast_build/ets_ui/arkoala-plugin.js + - arkoala/tools/arkoala-transformer/arkoala-plugin.js + expire_in: 1 day + + previewer Linux libs: + 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 - + artifacts: + paths: + - arkoala/har/app/arkoala/build/default/outputs/default/arkoala.har expire_in: 1 day -- Gitee From fd9f14c200341b8001e226d2d1ca1edc176ef92e Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Tue, 17 Dec 2024 15:55:29 +0300 Subject: [PATCH 8/9] Add job step Add compilation step --- arkoala/.gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arkoala/.gitlab-ci.yml b/arkoala/.gitlab-ci.yml index b66403f6d..8e4337a23 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -79,7 +79,9 @@ install node modules (arkoala): - 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 - expire_in: 1 day + - arkoala/framework + expire_in: 1 hour -- Gitee From f10b384680f2d2c0aea65ca25f1cff168e4e93d6 Mon Sep 17 00:00:00 2001 From: Alexander Vorobyev Date: Tue, 17 Dec 2024 17:30:07 +0300 Subject: [PATCH 9/9] Experiment Build experiment --- arkoala/.gitlab-ci.yml | 6 +++--- arkoala/framework/native/meson.build | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arkoala/.gitlab-ci.yml b/arkoala/.gitlab-ci.yml index 8e4337a23..d827e9c58 100644 --- a/arkoala/.gitlab-ci.yml +++ b/arkoala/.gitlab-ci.yml @@ -49,15 +49,15 @@ install node modules (arkoala): #language=sh script: - npm install - - npm run ohos-sdk - - export HOS_SDK_HOME="$(pwd)/arkoala/arkui-common/ohos-sdk-ets" + - 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 - previewer Linux libs: + native HZVM: stage: build interruptible: true extends: diff --git a/arkoala/framework/native/meson.build b/arkoala/framework/native/meson.build index 6aed8c7e9..4e19e3842 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 = [ -- Gitee