diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0dfa076d3939b0b6b5fca942dceee2ee0b08beb..7ea930f21a0e5b80bf8e6aaa5b56a5407e2bafc0 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 0000000000000000000000000000000000000000..1e920ad48ea0ae54a62befb73b99906934d83963 --- /dev/null +++ b/arkoala-arkts/har/.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 --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 + paths: + - arkoala-arkts.har diff --git a/arkoala-arkts/har/package.json b/arkoala-arkts/har/package.json index 59f47e1de4b490821e7274dee651f8d9b088adaa..eedfc03450130c0960e6a3090fa536f08cab15e1 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 bc6a7b2fdce772cb2cb5feadf7fa39057e3fa80e..8783142eb9e27e777ff9dc22cffa427feec508c9 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() diff --git a/gitlab/setup.yml b/gitlab/setup.yml index 69a5a5008b838b9140029cea6ce33616996c5c4e..2ca2710d3fb0e44d470e776f28be72155509a1ff 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 .. diff --git a/incremental/tools/panda/package.json b/incremental/tools/panda/package.json index 46fdec4bde2fb5c35806753c209dbe461091eeab..912bdca353448d262a7381f979c3f197d219c411 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" }