diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0dfa076d3939b0b6b5fca942dceee2ee0b08beb..851b4c70e917ae3a1fdab72ee50733e8d6b1448a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ stages: - build - test - idlize + - pack workflow: rules: @@ -20,6 +21,8 @@ include: - incremental/runtime/.gitlab-ci.yml - incremental/demo-playground/.gitlab-ci.yml - arkoala/arkui/.gitlab-ci.yml + - arkoala-arkts/har/.gitlab-ci.yml + - tmpdir/.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..edbeb1f0e0c39fc4ebb42cdf893c17b6aa3f255d --- /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: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 dbfa0060dd5b04318b0200a90aef1a32816a9207..dfce1ca0dd2981cfdc5aebdda329002f1b95a203 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:old": "test \"$KOALA_BZ\" = \"1\" && npm install --prefix ../incremental/tools/panda --no-save @panda/sdk@1.5.0-dev.7123 || npm install --prefix ../incremental/tools/panda --no-save @panda/sdk@next", "panda:sdk:install": "npm install --prefix ../incremental/tools/panda --no-save @panda/sdk@next", "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", 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/arkts/common.js b/incremental/tools/panda/arkts/common.js index 9ff866df3031aabae307290c3f4541b5acc14513..6acbe625181ed10f464298e5ee8cc1dd097ce644 100644 --- a/incremental/tools/panda/arkts/common.js +++ b/incremental/tools/panda/arkts/common.js @@ -22,7 +22,15 @@ const ARCH_TOOLS = (() => { const p = process.platform const suffix = "_host_tools" switch (p) { - case "linux": return p + suffix + case "linux": + const a = process.arch + switch (a) { + case "x64": + return p + suffix + case "arm64": + return p + "_" + a + suffix + default: throw new Error(`Unsupported platform ${p}, arch: ${a}`) + } case "win32": return "windows" + suffix default: throw new Error(`Unsupported platform ${p}`) } 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" }