From 23aa3a0110d119c720c8130d4d26c497cd450440 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Wed, 5 Feb 2025 17:31:05 +0300 Subject: [PATCH 1/6] ci tasks Signed-off-by: naumovdmitrii --- arkoala-arkts/.gitlab-ci.yml | 6 ++---- arkoala-arkts/libarkts/.gitlab-ci.yml | 30 ++++++++++++++++++++------- arkoala-arkts/libarkts/package.json | 7 +++++-- arkoala-arkts/package.json | 2 +- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index f62642a23..aaaa07fef 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -118,16 +118,15 @@ install node modules (arkoala-arkts): expire_in: 1 day build compat (w/plugin): - allow_failure: true stage: build interruptible: true extends: - .linux-vm-shell-task needs: - - install node modules (arkoala) - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api before_script: - !reference [.setup, script] - npm run panda:sdk:install --prefix arkoala-arkts @@ -136,16 +135,15 @@ install node modules (arkoala-arkts): - npm run build:compat:inc:capi --prefix incremental/compat build common (w/plugin): - allow_failure: true stage: build interruptible: true extends: - .linux-vm-shell-task needs: - - install node modules (arkoala) - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api before_script: - !reference [.setup, script] - npm run panda:sdk:install --prefix arkoala-arkts diff --git a/arkoala-arkts/libarkts/.gitlab-ci.yml b/arkoala-arkts/libarkts/.gitlab-ci.yml index faf0305b3..52517c40e 100644 --- a/arkoala-arkts/libarkts/.gitlab-ci.yml +++ b/arkoala-arkts/libarkts/.gitlab-ci.yml @@ -11,47 +11,61 @@ # See the License for the specific language governing permissions and # limitations under the License. +regenerate plugin-api: + interruptible: true + stage: build + extends: .linux-vm-shell-task + before_script: + - !reference [ .setup, script ] + - cd arkoala-arkts/libarkts + - npm run sdk:install + script: + - npm run regenerate -y + needs: + - install node modules (arkoala-arkts) + - install node modules (incremental) + - install node modules (interop) + build plugin-api: - allow_failure: true interruptible: true stage: build extends: .linux-vm-shell-task before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run panda:sdk:install + - npm run sdk:install script: - npm run compile needs: - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api test plugin-api: - allow_failure: true interruptible: true stage: test extends: .linux-vm-shell-task before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run panda:sdk:install + - npm run sdk:install script: - npm run test needs: - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api test example arkts-plugin: - allow_failure: true interruptible: true stage: test extends: .linux-vm-shell-task before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run panda:sdk:install + - npm run sdk:install script: - npm run run needs: @@ -60,19 +74,19 @@ test example arkts-plugin: - install node modules (interop) test libarkts playground: - allow_failure: true interruptible: true stage: test extends: .linux-vm-shell-task before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run panda:sdk:install + - npm run sdk:install script: - npm run run:playground needs: - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json index e471f1bb9..b30553fc5 100644 --- a/arkoala-arkts/libarkts/package.json +++ b/arkoala-arkts/libarkts/package.json @@ -18,7 +18,6 @@ }, "scripts": { "clean": "rimraf build native/build*", - "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", "compile:koala:interop": "npm run --prefix ../../interop compile", "compile:meson": "cd native && meson setup build && meson compile -C build", "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda.node ./build/native/build", @@ -33,6 +32,10 @@ "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main", "compile:playground": "cd playground && meson setup build && meson compile -C build", "run:playground": "npm run compile:playground && ./playground/build/playground.out", - "regenerate": "npx @idlizer/libarkts-gen@$npm_package_config_gen_version --input-file $npm_package_config_input_file --output-dir ../ --files bridges,nativeModule" + "regenerate": "npx @idlizer/libarkts-gen@$npm_package_config_gen_version --input-file $npm_package_config_input_file --output-dir ../ --files bridges,nativeModule", + "sdk:clear": "cd ../../incremental/tools/panda && rimraf node_modules", + "sdk:install": "cd ../../incremental/tools/panda && npm run sdk:install", + "sdk:reinstall": "npm run sdk:clear && npm run sdk:install", + "reinstall:regenerate": "npm run sdk:reinstall && npm run regenerate" } } diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index 17d41b17a..d0c9083c8 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -39,7 +39,7 @@ "tsconfig-paths": "^4.2.0" }, "scripts": { - "panda:sdk:install": "npm run panda:sdk:install --prefix ../incremental/tools/panda", + "sdk:install": "npm run sdk:install --prefix ../incremental/tools/panda", "compile:native:node-host": "npm run compile:native-panda-with-node-host --prefix ../arkoala/framework", "compile:native:panda-host": "npm run compile:native-panda-host --prefix ../arkoala/framework", "compile:native:hzvm-ohos-arm32": "npm run compile:native-panda-with-hzvm-ohos-arm32 --prefix ../arkoala/framework", -- Gitee From 2f555d8aea3c12ed482b0d6326de0a0e993fe3c4 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Wed, 5 Feb 2025 18:21:32 +0300 Subject: [PATCH 2/6] fix rename Signed-off-by: naumovdmitrii --- arkoala-arkts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index d0c9083c8..17d41b17a 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -39,7 +39,7 @@ "tsconfig-paths": "^4.2.0" }, "scripts": { - "sdk:install": "npm run sdk:install --prefix ../incremental/tools/panda", + "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:panda-host": "npm run compile:native-panda-host --prefix ../arkoala/framework", "compile:native:hzvm-ohos-arm32": "npm run compile:native-panda-with-hzvm-ohos-arm32 --prefix ../arkoala/framework", -- Gitee From 1801dce80879bf00b23e236cb58bd22507a9d3b8 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 6 Feb 2025 11:03:26 +0300 Subject: [PATCH 3/6] rename Signed-off-by: naumovdmitrii --- arkoala-arkts/libarkts/.gitlab-ci.yml | 10 +++++----- arkoala-arkts/libarkts/package.json | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arkoala-arkts/libarkts/.gitlab-ci.yml b/arkoala-arkts/libarkts/.gitlab-ci.yml index 52517c40e..0e95f96f1 100644 --- a/arkoala-arkts/libarkts/.gitlab-ci.yml +++ b/arkoala-arkts/libarkts/.gitlab-ci.yml @@ -18,7 +18,7 @@ regenerate plugin-api: before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run sdk:install + - npm run panda:sdk:install script: - npm run regenerate -y needs: @@ -33,7 +33,7 @@ build plugin-api: before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run sdk:install + - npm run panda:sdk:install script: - npm run compile needs: @@ -49,7 +49,7 @@ test plugin-api: before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run sdk:install + - npm run panda:sdk:install script: - npm run test needs: @@ -65,7 +65,7 @@ test example arkts-plugin: before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run sdk:install + - npm run panda:sdk:install script: - npm run run needs: @@ -80,7 +80,7 @@ test libarkts playground: before_script: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - - npm run sdk:install + - npm run panda:sdk:install script: - npm run run:playground needs: diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json index b30553fc5..0c15806f2 100644 --- a/arkoala-arkts/libarkts/package.json +++ b/arkoala-arkts/libarkts/package.json @@ -34,8 +34,8 @@ "run:playground": "npm run compile:playground && ./playground/build/playground.out", "regenerate": "npx @idlizer/libarkts-gen@$npm_package_config_gen_version --input-file $npm_package_config_input_file --output-dir ../ --files bridges,nativeModule", "sdk:clear": "cd ../../incremental/tools/panda && rimraf node_modules", - "sdk:install": "cd ../../incremental/tools/panda && npm run sdk:install", - "sdk:reinstall": "npm run sdk:clear && npm run sdk:install", - "reinstall:regenerate": "npm run sdk:reinstall && npm run regenerate" + "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", + "panda:sdk:reinstall": "npm run sdk:clear && npm run panda:sdk:install", + "reinstall:regenerate": "npm run panda:sdk:reinstall && npm run regenerate" } } -- Gitee From e11b2fe7f227c6034288d939028957db9a92f876 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 6 Feb 2025 11:06:15 +0300 Subject: [PATCH 4/6] rename Signed-off-by: naumovdmitrii --- arkoala-arkts/libarkts/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json index 0c15806f2..55d803ed2 100644 --- a/arkoala-arkts/libarkts/package.json +++ b/arkoala-arkts/libarkts/package.json @@ -24,18 +24,18 @@ "compile:native": "npm run compile:koala:interop && npm run compile:meson && npm run copy:.node", "compile:src": "npx ets-tsc -p ./tsconfig.json", "compile": "npm run compile:native && npm run compile:src", - "compile:plugin": "npx ets-tsc -p plugins/tsconfig.json", + "compile:plugins": "npx ets-tsc -p plugins/tsconfig.json", "run:js": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk node . --file ./plugins/input/main.sts --arktsconfig ./arktsconfig.json --output ./build/abc/main.abc --dump-plugin-ast", - "run": "npm run compile && npm run compile:plugin && npm run run:js", + "run": "npm run compile && npm run compile:plugins && npm run run:js", + "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main", "mocha": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0", "test": "npm run compile:native && npm run mocha", - "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main", "compile:playground": "cd playground && meson setup build && meson compile -C build", "run:playground": "npm run compile:playground && ./playground/build/playground.out", - "regenerate": "npx @idlizer/libarkts-gen@$npm_package_config_gen_version --input-file $npm_package_config_input_file --output-dir ../ --files bridges,nativeModule", - "sdk:clear": "cd ../../incremental/tools/panda && rimraf node_modules", + "panda:sdk:clean": "cd ../../incremental/tools/panda && rimraf node_modules", "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", - "panda:sdk:reinstall": "npm run sdk:clear && npm run panda:sdk:install", + "panda:sdk:reinstall": "npm run panda:sdk:clean && npm run panda:sdk:install", + "regenerate": "npx @idlizer/libarkts-gen@$npm_package_config_gen_version --input-file $npm_package_config_input_file --output-dir ../ --files bridges,nativeModule", "reinstall:regenerate": "npm run panda:sdk:reinstall && npm run regenerate" } } -- Gitee From 06bf519c49941c9a332c2cb9fbebe4f29599bbb4 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 6 Feb 2025 12:18:08 +0300 Subject: [PATCH 5/6] logs Signed-off-by: naumovdmitrii --- arkoala-arkts/libarkts/.gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arkoala-arkts/libarkts/.gitlab-ci.yml b/arkoala-arkts/libarkts/.gitlab-ci.yml index 0e95f96f1..63257c5a6 100644 --- a/arkoala-arkts/libarkts/.gitlab-ci.yml +++ b/arkoala-arkts/libarkts/.gitlab-ci.yml @@ -20,7 +20,9 @@ regenerate plugin-api: - cd arkoala-arkts/libarkts - npm run panda:sdk:install script: - - npm run regenerate -y + - npm show @idlizer/libarkts-gen + - npm show @idlizer/libarkts-gen --json + - npm run regenerate needs: - install node modules (arkoala-arkts) - install node modules (incremental) -- Gitee From e1080d4d0c400b4c5864af7d8224179167e31533 Mon Sep 17 00:00:00 2001 From: naumovdmitrii Date: Thu, 6 Feb 2025 12:38:40 +0300 Subject: [PATCH 6/6] fix Signed-off-by: naumovdmitrii --- arkoala-arkts/libarkts/.gitlab-ci.yml | 2 -- gitlab/setup.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arkoala-arkts/libarkts/.gitlab-ci.yml b/arkoala-arkts/libarkts/.gitlab-ci.yml index 63257c5a6..56f444620 100644 --- a/arkoala-arkts/libarkts/.gitlab-ci.yml +++ b/arkoala-arkts/libarkts/.gitlab-ci.yml @@ -20,8 +20,6 @@ regenerate plugin-api: - cd arkoala-arkts/libarkts - npm run panda:sdk:install script: - - npm show @idlizer/libarkts-gen - - npm show @idlizer/libarkts-gen --json - npm run regenerate needs: - install node modules (arkoala-arkts) diff --git a/gitlab/setup.yml b/gitlab/setup.yml index a83191b8a..a04c621a2 100644 --- a/gitlab/setup.yml +++ b/gitlab/setup.yml @@ -6,7 +6,7 @@ - npm config set @koalaui: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 @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 @idlizer: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 - npm config list -- Gitee