From 85c7eccc4464a1adc0cb2a454faec67b32a311dd Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 11 Nov 2024 14:58:21 +0300 Subject: [PATCH 1/3] fix --- .gitlab-ci.yml | 2 ++ arkoala-arkts/.gitlab-ci.yml | 15 +++++++++++++++ arkoala-arkts/package.json | 6 +++--- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 arkoala-arkts/.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0dfa076d..f58f82883 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ stages: - build - test - idlize + - pack workflow: rules: @@ -20,6 +21,7 @@ include: - incremental/runtime/.gitlab-ci.yml - incremental/demo-playground/.gitlab-ci.yml - arkoala/arkui/.gitlab-ci.yml + - arkoala-arkts/.gitlab-ci.yml unmemoize arkoala-arkts/arkui: extends: diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml new file mode 100644 index 000000000..edbeb1f0e --- /dev/null +++ b/arkoala-arkts/.gitlab-ci.yml @@ -0,0 +1,15 @@ +pack arkoala-arkts har-arm32 (linux): + stage: pack + interruptible: true + extends: + - .linux-vm-shell-task + needs: [] + script: + - !reference [.setup, script] + - npm run panda:sdk:install:old --prefix arkoala-arkts + - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run trivial:all:har-arm32 --prefix arkoala-arkts + - cp $CI_PROJECT_DIR/arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har $CI_PROJECT_DIR/arkoala-arkts.har + artifacts: + expire_in: 1 week + paths: + - arkoala-arkts.har diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index dbfa0060d..3ce95416f 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -27,13 +27,13 @@ "typescript": "4.9.5" }, "scripts": { - "panda:sdk:install:old": "test \"$KOALA_BZ\" = \"0\" && npm install --prefix ../incremental/tools/panda --no-save @panda/sdk@1.5.0-dev.1 || npm install --prefix ../incremental/tools/panda --no-save @panda/sdk@1.5.0-dev.1382", - "panda:sdk:install": "npm install --prefix ../incremental/tools/panda --no-save @panda/sdk@next", + "panda:sdk:install:old": "test \"$KOALA_BZ\" = \"1\" && PANDA_SDK_VERSION=1.5.0-dev.7123 npm run panda:sdk:install || PANDA_SDK_VERSION=1.5.0-dev.1382 npm run panda:sdk:install", + "panda:sdk:install": "npm run panda:sdk:install --prefix ../incremental/tools/panda", "compile:native:node-host": "npm run compile:native-panda-with-node-host --prefix ../arkoala/framework", "compile:native:hzvm-ohos-arm32": "npm run compile:native-panda-with-hzvm-ohos-arm32 --prefix ../arkoala/framework", "trivial:arkui": "npm run compile:trivial --prefix arkui", "trivial:application": "bash ../incremental/tools/panda/arkts/arktsc --arktsconfig framework/arktsconfig-trivial.json", - "trivial:arkoala": "npm run trivial:arkui && npm run trivial:application && mkdir -p build && bash ../incremental/tools/panda/arkts/arklink --output build/arkoala.abc -- ../incremental/runtime/build/incremental.abc arkui/build/arkui.abc framework/build/abc/trivial/Application.abc", + "trivial:arkoala": "npm run trivial:arkui && npm run trivial:application && npm run link:incremental --prefix ../incremental/runtime && mkdir -p build && bash ../incremental/tools/panda/arkts/arklink --output build/arkoala.abc -- ../incremental/runtime/build/incremental.abc arkui/build/arkui.abc framework/build/abc/trivial/Application.abc", "build:loader:node": "npm run build:loader:node --prefix loader", "build:loader:ohos-arm32": "npm run build:loader:ohos-arm32 --prefix loader", "run:node": "ACE_LIBRARY_PATH=../arkoala/framework/build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js", -- Gitee From 8f6cbbb15bdc23084f1d48ef6d835713f124e65f Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 11 Nov 2024 13:24:44 +0000 Subject: [PATCH 2/3] update arkoala-arkts/.gitlab-ci.yml. Signed-off-by: Igor Loginov --- arkoala-arkts/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index edbeb1f0e..721b6ea75 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -6,7 +6,7 @@ pack arkoala-arkts har-arm32 (linux): needs: [] script: - !reference [.setup, script] - - npm run panda:sdk:install:old --prefix arkoala-arkts + - KOALA_BZ=1 npm run panda:sdk:install:old --prefix arkoala-arkts - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run trivial:all:har-arm32 --prefix arkoala-arkts - cp $CI_PROJECT_DIR/arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har $CI_PROJECT_DIR/arkoala-arkts.har artifacts: -- Gitee From 36266cc4a3f64fe6f3a575ec6e2f4f119deac7b6 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 11 Nov 2024 19:18:24 +0300 Subject: [PATCH 3/3] verbose --- arkoala/framework/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala/framework/package.json b/arkoala/framework/package.json index c9ae2443f..8bfed40d5 100644 --- a/arkoala/framework/package.json +++ b/arkoala/framework/package.json @@ -46,7 +46,7 @@ "compile:native-panda-with-node-host": "npm run configure:native-panda-with-node-host && cd native && npm run compile:native-panda-host && meson compile -C build-node-host-vmloader && meson install -C build-node-host-vmloader", "configure:native-panda-with-hzvm-ohos-arm64": "npm run configure:native-panda-ohos-arm64 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm64-vmloader", "compile:native-panda-with-hzvm-ohos-arm64": "npm run configure:native-panda-with-hzvm-ohos-arm64 && npm run compile:native-panda-ohos-arm64 && cd native && meson compile -C build-hzvm-ohos-arm64-vmloader && meson install -C build-hzvm-ohos-arm64-vmloader", - "configure:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-ohos-arm32 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm32-vmloader", + "configure:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-ohos-arm32 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm32-vmloader --verbose", "compile:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-with-hzvm-ohos-arm32 && npm run compile:native-panda-ohos-arm32 && cd native && meson compile -C build-hzvm-ohos-arm32-vmloader && meson install -C build-hzvm-ohos-arm32-vmloader", "compile:node-host": "memo-tsc -b . && npm run compile:native-node-host", "compile": "npm run compile:node-host", -- Gitee