From bc131e7249128c387dbeb6df55b8776a1b331646 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Wed, 16 Oct 2024 14:52:56 +0300 Subject: [PATCH 1/7] pack-arkoala-arkts-har --- .gitlab-ci.yml | 2 ++ arkoala-arkts/har/.gitlab-ci.yml | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 arkoala-arkts/har/.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0dfa076d..7ea930f21 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/har/.gitlab-ci.yml unmemoize arkoala-arkts/arkui: extends: diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml new file mode 100644 index 000000000..ae5ae0dba --- /dev/null +++ b/arkoala-arkts/har/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pack arkoala-arkts har-arm32 (linux): + stage: pack + interruptible: true + extends: + - .linux-vm-shell-task + needs: [] + script: + - !reference [.setup, script] + - cd arkoala-arkts/har && KOALA_BZ=1 HOS_SDK_HOME=../../arkoala/ohos-sdk/ohos-sdk OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run all-arm32 + artifacts: + - arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har -- Gitee From de3e58817bf75bd9134138e42c7deff724aed7ef Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Wed, 16 Oct 2024 15:27:55 +0300 Subject: [PATCH 2/7] empty -- Gitee From 43010e566c7759777f6d81816c5325be475c94f1 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Wed, 16 Oct 2024 15:49:10 +0300 Subject: [PATCH 3/7] fix --- arkoala-arkts/har/.gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml index ae5ae0dba..f48543a3e 100644 --- a/arkoala-arkts/har/.gitlab-ci.yml +++ b/arkoala-arkts/har/.gitlab-ci.yml @@ -7,5 +7,8 @@ pack arkoala-arkts har-arm32 (linux): script: - !reference [.setup, script] - cd arkoala-arkts/har && KOALA_BZ=1 HOS_SDK_HOME=../../arkoala/ohos-sdk/ohos-sdk OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run all-arm32 + - cp $CI_PROJECT_DIR/arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har $CI_PROJECT_DIR/arkoala-arkts.har artifacts: - - arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har + expire_in: 1 week + paths: + - arkoala-arkts.har -- Gitee From 5050e42fed1581fb85f91b28745a3420f2547b00 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Wed, 16 Oct 2024 16:04:41 +0300 Subject: [PATCH 4/7] fix --- arkoala-arkts/har/.gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml index f48543a3e..1e920ad48 100644 --- a/arkoala-arkts/har/.gitlab-ci.yml +++ b/arkoala-arkts/har/.gitlab-ci.yml @@ -6,7 +6,8 @@ pack arkoala-arkts har-arm32 (linux): needs: [] script: - !reference [.setup, script] - - cd arkoala-arkts/har && KOALA_BZ=1 HOS_SDK_HOME=../../arkoala/ohos-sdk/ohos-sdk OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run all-arm32 + - npm run panda:sdk:install --prefix arkoala-arkts/har + - KOALA_BZ=1 HOS_SDK_HOME=../../arkoala/ohos-sdk/ohos-sdk OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run all-arm32 --prefix arkoala-arkts/har - 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 -- Gitee From 1612977972185b8983a58cf5f8b8a0117726a45a Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Wed, 16 Oct 2024 16:32:35 +0300 Subject: [PATCH 5/7] panda registry --- gitlab/setup.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab/setup.yml b/gitlab/setup.yml index 69a5a5008..2ca2710d3 100644 --- a/gitlab/setup.yml +++ b/gitlab/setup.yml @@ -6,6 +6,7 @@ - npm config set @koalaui:registry https://nexus.bz-openlab.ru:10443/repository/koala-npm/ - npm config set @arkoala:registry https://nexus.bz-openlab.ru:10443/repository/koala-npm/ - npm config set @azanat:registry https://nexus.bz-openlab.ru:10443/repository/koala-npm/ + - npm config set @panda:registry https://nexus.bz-openlab.ru:10443/repository/koala-npm/ - npm config set //nexus.bz-openlab.ru:10443/repository/koala-npm/:_auth $NEXUS_NPM_PASS # remove when the root package.json is removed - cd incremental && npm i --no-audit --no-fund && cd .. -- Gitee From 1a344e8132c17bf6526561b0a6256433a7b0fde1 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Wed, 16 Oct 2024 17:25:09 +0300 Subject: [PATCH 6/7] show panda sdk version --- incremental/tools/panda/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incremental/tools/panda/package.json b/incremental/tools/panda/package.json index 46fdec4bd..912bdca35 100644 --- a/incremental/tools/panda/package.json +++ b/incremental/tools/panda/package.json @@ -2,7 +2,7 @@ "name": "panda-installer", "private": true, "scripts": { - "panda:sdk:install": "npm install --prefix . --no-save @panda/sdk@next", + "panda:sdk:install": "npm install --prefix . --no-save @panda/sdk@next && npm show @panda/sdk@next", "panda:sdk:clean": "rimraf ./node_modules", "panda:sdk:build": "node ./build_panda_sdk.mjs --panda-sdk-dir=./node_modules/@panda/sdk/ --arkcompiler-build-dir=$HOME/arkcompiler --runtime-git-rev=a6704b6a --frontend-git-rev=c2166bf1 --frontend-git-patches=./fix_es2panda_1.patch:./fix_normalizing_source_paths.patch" } -- Gitee From e683ec7b255b959e6eac8c0bed0372f6a535df33 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 21 Oct 2024 11:33:14 +0300 Subject: [PATCH 7/7] fix for current master --- arkoala-arkts/har/package.json | 6 ++++-- arkoala-arkts/har/scripts/build-arkoala-har.mjs | 5 +---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arkoala-arkts/har/package.json b/arkoala-arkts/har/package.json index 59f47e1de..eedfc0345 100644 --- a/arkoala-arkts/har/package.json +++ b/arkoala-arkts/har/package.json @@ -17,8 +17,10 @@ "rollup": "^4.13.0" }, "scripts": { - "clean": "rimraf app/arkoala/build app/arkoala/libs app/arkoala/bundle.js arkoala-har-bundle/dist", - "compile:arkoala-arkts": "npm run --prefix ../arkui compile:arkts:unmemoized && npm run --prefix ../../incremental/compat compile:arkts && npm run --prefix ../../incremental/common compile:arkts && npm run compile:arkts:unmemoizing --prefix ../../incremental/runtime && npm run link:arkts --prefix ../arkui", + "clean": "rimraf app/arkoala/build app/arkoala/libs app/arkoala/bundle.js arkoala-har-bundle/dist ../arkui/build ../../arkoala/framework/build", + "copy": "mkdir -p app/arkoala/libs/arm64-v8a && cp ../../arkoala/framework/native/build-panda-ohos-arm64/libArkoalaNative.so app/arkoala/libs/arm64-v8a", + "copy:arm32": "mkdir -p app/arkoala/libs/armeabi-v7a && cp ../../arkoala/framework/build/libArkoalaNative.so app/arkoala/libs/armeabi-v7a && cp ../../arkoala/framework/build/libvmloader.so app/arkoala/libs/armeabi-v7a && cp ../../arkoala/framework/build/libArkoalaNative_ark.so app/arkoala/libs/armeabi-v7a", + "compile:arkoala-arkts": "npm run link:arkoala --prefix ../arkui", "native:clean": "npm run --prefix ../../arkoala/framework clean", "native:build": "npm run --prefix ../../arkoala/framework compile:native-panda-with-hzvm-ohos-arm64", "native:build-arm32": "npm run --prefix ../../arkoala/framework compile:native-panda-with-hzvm-ohos-arm32", diff --git a/arkoala-arkts/har/scripts/build-arkoala-har.mjs b/arkoala-arkts/har/scripts/build-arkoala-har.mjs index bc6a7b2fd..8783142eb 100644 --- a/arkoala-arkts/har/scripts/build-arkoala-har.mjs +++ b/arkoala-arkts/har/scripts/build-arkoala-har.mjs @@ -45,10 +45,7 @@ function main() { rollupLaunch() /* we don't yet know which files should be in har */ copyFilesToHar(LIBCSHARED_PATH, path.join(HAR_PATH, `libs/armeabi-v7a/libc++_shared.so`)) - copyFilesToHar(path.join(_dirname, `../../../arkoala/framework/native/build-hzvm-ohos-arm32-vmloader/libArkoalaLoader.so`), path.join(HAR_PATH, `libs/armeabi-v7a/libArkoalaLoader.so`)) - copyFilesToHar(path.join(_dirname, `../../../arkoala/framework/native/build-hzvm-ohos-arm32-vmloader/libvmloader.so`), path.join(HAR_PATH, `libs/armeabi-v7a/libvmloader.so`)) - copyFilesToHar(path.join(_dirname, `../../../arkoala/framework/native/build-panda-ohos-arm32/libArkoalaNative_ark.so`), path.join(HAR_PATH, `libs/armeabi-v7a/libArkoalaNative_ark.so`)) - copyFilesToHar(path.join(_dirname, `../../build/arkoala.abc`), path.join(HAR_PATH, `libs/armeabi-v7a/arkoala.abc.so`)) + copyFilesToHar(path.join(CWD, "../arkui/arkoala.abc"), path.join(HAR_PATH, `libs/armeabi-v7a/arkoala.abc.so`)) } main() -- Gitee