From a0117e2214a2debcb67086818d01033863f5c103 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Fri, 6 Jun 2025 13:35:24 +0300 Subject: [PATCH 01/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 282 +++++++++++------------------------ 1 file changed, 91 insertions(+), 191 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index b0b7e224df..50e9def23c 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -63,97 +63,6 @@ install node modules (arkoala-arkts): - arkoala-arkts/framework/build/libc++.so expire_in: 1 day - build arkui-common.abc: - stage: build - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - before_script: - - !reference [.setup, script] - - npm run panda:sdk:install --prefix arkoala-arkts - script: - - npm run build:arkui-common:inc --prefix arkoala-arkts - artifacts: - paths: - - arkoala-arkts/arkui-common/build/arkui-common.abc - expire_in: 1 day - - build arkui-no-common.abc: - stage: build - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - before_script: - - !reference [.setup, script] - - npm run panda:sdk:install --prefix arkoala-arkts - script: - - npm run build:arkui-no-common:inc --prefix arkoala-arkts - artifacts: - paths: - - arkoala-arkts/arkui/build/arkui-no-common.abc - expire_in: 1 day - - build arkui-no-common.abc (w/restart): - stage: build - allow_failure: true - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - - annotate all - before_script: - - !reference [.setup, script] - - !reference [.setup, regenerate-plugin-api] - script: - - npm run build:arkui-no-common:inc:ui2abc:restart --prefix arkoala-arkts/arkui - - build arkui-no-common.abc (w/plugins): - stage: build - allow_failure: true - when: manual - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - - annotate all - before_script: - - !reference [.setup, script] - - !reference [.setup, regenerate-plugin-api] - script: - - npm run compile --prefix ui2abc/memo-plugin - - npm run build:compat:inc:ui2abc --prefix incremental/compat - - npm run build:common:inc:ui2abc --prefix incremental/common - - npm run build:runtime:inc:ui2abc --prefix incremental/runtime - - npm run build:interop:inc:ui2abc --prefix interop - - npm run build:arkui-common:inc:ui2abc --prefix arkoala/arkui-common - - npm run build:arkui-no-common:inc:ui2abc --prefix arkoala-arkts/arkui - build incremental.abc: stage: build interruptible: true @@ -271,95 +180,6 @@ install node modules (arkoala-arkts): - interop/build/interop.abc expire_in: 1 day - link arkoala.abc: - stage: build - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - - build arkui-common.abc - - build arkui-no-common.abc - - build incremental.abc - - build interop.abc - before_script: - - !reference [.setup, script] - - npm run panda:sdk:install --prefix arkoala-arkts - script: - - npm run link:arkoala --prefix arkoala-arkts - artifacts: - paths: - - arkoala-arkts/build/arkoala.abc - expire_in: 1 day - - build user.abc: - stage: build - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - before_script: - - !reference [.setup, script] - - npm run panda:sdk:install --prefix arkoala-arkts - script: - - npm run build:user --prefix arkoala-arkts - artifacts: - paths: - - arkoala-arkts/trivial/user/build/user.abc - expire_in: 1 day - - build shopping.abc (recheck): - stage: build - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - before_script: - - !reference [.setup, script] - - !reference [.setup, regenerate-plugin-api] - - npm run build:all --prefix ui2abc - script: - - npm run build:user:pure-ets:m3:recheck --prefix arkoala-arkts/shopping/user - - build shopping.abc (restart): - stage: build - interruptible: true - extends: - - .linux-vm-shell-task - needs: - - install node modules (ui2abc) - - install node modules (arkoala) - - install node modules (arkoala-arkts) - - install node modules (incremental) - - install node modules (interop) - - install node modules (tools) - before_script: - - !reference [.setup, script] - - !reference [.setup, regenerate-plugin-api] - - npm run build:all --prefix ui2abc - script: - - npm run build:arkui-common:inc:ui2abc --prefix arkoala-arkts/arkui-common - - npm run build:sdk-m3:inc:ui2abc --prefix arkoala-arkts/arkui - - npm run build:user:pure-ets:m3 --prefix arkoala-arkts/shopping/user - - run:node:ci (linux, linux, node+panda): stage: test interruptible: true @@ -371,8 +191,8 @@ install node modules (arkoala-arkts): - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) - - link arkoala.abc - - build user.abc + - install node modules (tools) + - build incremental.abc - build ArkoalaNative (linux, linux, node+panda) before_script: - !reference [.setup, script] @@ -394,7 +214,8 @@ install node modules (arkoala-arkts): - install node modules (incremental) - install node modules (interop) - install node modules (tools) - - link arkoala.abc + - build incremental.abc + - build interop.abc - build ArkoalaNative (linux, ohos-arm32, hzvm+panda) before_script: - !reference [.setup, script] @@ -406,7 +227,7 @@ install node modules (arkoala-arkts): - arkoala-arkts-arm32.har expire_in: 1 day - user-32.har: + user-32-m3.har: stage: build interruptible: true extends: @@ -418,18 +239,94 @@ install node modules (arkoala-arkts): - install node modules (incremental) - install node modules (interop) - install node modules (tools) - - build user.abc + - build incremental.abc + - build interop.abc + - build ArkoalaNative (linux, ohos-arm32, hzvm+panda) before_script: - !reference [.setup, script] - - npm run panda:sdk:install --prefix arkoala-arkts + - | + npm run compile --prefix ui2abc/fast-arktsc + + # Configure npm registry and authentication + echo '@panda:registry=https://nexus.bz-openlab.ru:10443/repository/koala-npm/' >> ~/.npmrc + echo "//nexus.bz-openlab.ru:10443/repository/koala-npm/:_auth=${NEXUS_NPM_PASS}" >> ~/.npmrc + echo 'strict-ssl=false' >> ~/.npmrc + + # Install SDK + echo "Installing @panda/sdk..." + if ! npm run panda:sdk:install --prefix arkoala-arkts; then + echo "❌ Failed to install @panda/sdk" + exit 1 + fi + + # Install interop package + echo "Installing @koalaui/interop..." + cd interop || { echo "❌ Failed to cd to interop"; exit 1; } + npm install || { echo "❌ Failed to install interop deps"; exit 1; } + npm run compile || { echo "❌ Failed to build interop"; exit 1; } + cd "$CI_PROJECT_DIR" || exit 1 + + # Link interop package + echo "Linking @koalaui/interop..." + cd interop && npm link && cd .. || { echo "❌ Failed to link interop"; exit 1; } + + # Build libarkts - skip native compilation + echo "Building libarkts..." + cd ui2abc/libarkts || { echo "❌ Failed to cd to libarkts"; exit 1; } + + npm install || { echo "❌ npm install failed"; exit 1; } + npm run reinstall:regenerate || { echo "❌ reinstall:regenerate failed"; exit 1; } + + # Skip native compilation + echo "Skipping native compilation due to SDK version mismatch" + mkdir -p native/build + touch native/build/skip_native_build + + # Build libarkts + echo "Building libarkts..." + npm run reinstall:regenerate + npm run compile || { echo "❌ Build failed"; exit 1; } + + # Link libarkts + echo "Linking @koalaui/libarkts..." + cd "$CI_PROJECT_DIR" || exit 1 + cd ui2abc && npm link ./libarkts && cd .. || { echo "❌ Failed to link libarkts"; exit 1; } + + # Install other dependencies + echo "Installing other dependencies..." + cd ui2abc && npm install && cd .. || { echo "❌ Failed to install ui2abc deps"; exit 1; } + npm install || { echo "❌ npm install failed"; exit 1; } + + # Ensure the module is linked in ui2abc + echo "Ensuring @koalaui/libarkts is linked in ui2abc..." + cd ui2abc && npm link @koalaui/libarkts && cd .. || { echo "❌ Failed to link @koalaui/libarkts in ui2abc"; exit 1; } script: - - npm run har-arm32 --prefix arkoala-arkts/trivial/user - - mv arkoala-arkts/trivial/user/app/user/build/default/outputs/default/user.har user-arm32.har + - | + echo "📂 Current dir: $(pwd)" + if [ ! -f "arkoala-arkts/trivial/user/package.json" ]; then + echo "❌ package.json not found!" + exit 1 + fi + + # Create ets directory and copy index.ts + echo "🔄 Setting up ets directory..." + cd incremental/runtime || { echo "❌ Failed to cd to runtime directory"; exit 1; } + mkdir -p ets || { echo "❌ Failed to create ets directory"; exit 1; } + cp src/index.ts ets/ || { echo "❌ Failed to copy index.ts to ets directory"; exit 1; } + echo "✅ Successfully set up ets directory with index.ts" + cd - > /dev/null # Return to previous directory + + cd arkoala-arkts/trivial/user || { echo "❌ Failed to cd to user directory"; exit 1; } + npm run har-arm32:m3 || { echo "❌ har-arm32:m3 failed"; exit 1; } + mv app/user/build/default/outputs/default/user.har "$CI_PROJECT_DIR/user-arm32-m3.har" + artifacts: paths: - - user-arm32.har + - user-arm32-m3.har + - ui2abc/fast-arktsc/lib expire_in: 1 day + unmemoize arkoala-arkts/arkui: allow_failure: true extends: @@ -466,7 +363,9 @@ unmemoize arkoala-arkts/arkui: - install node modules (incremental) - install node modules (interop) - install node modules (ets-tests) - - link arkoala.abc + - install node modules (tools) + - build incremental.abc + - build interop.abc - build ArkoalaNative (linux, linux, node+panda) variables: NOTIFY_NAME: "ARKTS" @@ -542,10 +441,12 @@ notification: - npm run compile --prefix ui2abc/memo-plugin - npm run compile --prefix ui2abc/fast-arktsc - npm run runtime:prepare --prefix ui2abc/memo-plugin + script: - | git clean -fdx && npm i && cd ui2abc/libarkts && npm run reinstall:regenerate && cd ../.. npm run all:m3 --prefix ets-tests > test-output.log 2>&1 + artifacts: paths: - test-output.log @@ -577,4 +478,3 @@ notification: - job: install node modules (arkoala-arkts) - job: install node modules (incremental) - job: install node modules (interop) - -- Gitee From a2614f30f78137970003301172d6562ef3367d2b Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Fri, 6 Jun 2025 14:24:11 +0300 Subject: [PATCH 02/14] CI-Cleanup --- arkoala-arkts/trivial/user/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/trivial/user/package.json b/arkoala-arkts/trivial/user/package.json index e17b18c261..3f7c90471b 100644 --- a/arkoala-arkts/trivial/user/package.json +++ b/arkoala-arkts/trivial/user/package.json @@ -17,9 +17,9 @@ "copy": "mkdir -p ../build && cp -r build/user.abc ../build/", "pack": "npm run clt:download && cd app && DEVECO_SDK_HOME=../$npm_package_config_sdk_path ../$npm_package_config_hvigorw_path --no-daemon --mode module -p product=default -p module=user@default assembleHar", "har-arm32": "npm run build:user && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", - "har-arm32:m3": "npm run build:user:pure-ets:m3 && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", + "har-arm32:m3": "npm run npm run build:restart && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", "har-arm64": "npm run build:user && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", - "har-arm64:m3": "npm run build:user:pure-ets:m3 && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", + "har-arm64:m3": "npm run npm run build:restart && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", "har-universal": "npm run build:user && node $npm_package_config_sdk_cli_path download && node scripts/build-har-universal.mjs --name user && npm run pack", "clt:download": "node $npm_package_config_clt_cli_path download" } -- Gitee From 02932bdbf799712559db986e156f3958a3908957 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Fri, 6 Jun 2025 15:23:39 +0300 Subject: [PATCH 03/14] CI-Cleanup --- arkoala-arkts/trivial/user/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/trivial/user/package.json b/arkoala-arkts/trivial/user/package.json index 3f7c90471b..ffd4be4a26 100644 --- a/arkoala-arkts/trivial/user/package.json +++ b/arkoala-arkts/trivial/user/package.json @@ -17,9 +17,9 @@ "copy": "mkdir -p ../build && cp -r build/user.abc ../build/", "pack": "npm run clt:download && cd app && DEVECO_SDK_HOME=../$npm_package_config_sdk_path ../$npm_package_config_hvigorw_path --no-daemon --mode module -p product=default -p module=user@default assembleHar", "har-arm32": "npm run build:user && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", - "har-arm32:m3": "npm run npm run build:restart && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", + "har-arm32:m3": "npm run build:restart && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", "har-arm64": "npm run build:user && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", - "har-arm64:m3": "npm run npm run build:restart && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", + "har-arm64:m3": "npm run build:restart && npm run copy && node $npm_package_config_sdk_cli_path download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", "har-universal": "npm run build:user && node $npm_package_config_sdk_cli_path download && node scripts/build-har-universal.mjs --name user && npm run pack", "clt:download": "node $npm_package_config_clt_cli_path download" } -- Gitee From 11adf860d88d13effcf66d982683240f0cf4ef05 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Fri, 6 Jun 2025 16:09:25 +0300 Subject: [PATCH 04/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 50e9def23c..8e456a8252 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -299,7 +299,8 @@ install node modules (arkoala-arkts): # Ensure the module is linked in ui2abc echo "Ensuring @koalaui/libarkts is linked in ui2abc..." - cd ui2abc && npm link @koalaui/libarkts && cd .. || { echo "❌ Failed to link @koalaui/libarkts in ui2abc"; exit 1; } + cd ui2abc && npm link @koalaui/libarkts && cd .. || { echo "❌ Failed to link @koalaui/libarkts in ui2abc"; exit 1; } + script: - | echo "📂 Current dir: $(pwd)" @@ -308,6 +309,13 @@ install node modules (arkoala-arkts): exit 1 fi + # Build M3 SDK first + echo "🔄 Building M3 SDK..." + cd arkoala-arkts/arkui || { echo "❌ Failed to cd to arkui directory"; exit 1; } + npm run build:sdk-m3 || { echo "❌ Failed to build M3 SDK"; exit 1; } + cd "$CI_PROJECT_DIR" || exit 1 + echo "✅ M3 SDK built successfully" + # Create ets directory and copy index.ts echo "🔄 Setting up ets directory..." cd incremental/runtime || { echo "❌ Failed to cd to runtime directory"; exit 1; } -- Gitee From 7df9c85f104fe211576ce4d0b4fdc06ed33594b1 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Fri, 6 Jun 2025 16:44:09 +0300 Subject: [PATCH 05/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 8e456a8252..ab415f1106 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -286,6 +286,8 @@ install node modules (arkoala-arkts): echo "Building libarkts..." npm run reinstall:regenerate npm run compile || { echo "❌ Build failed"; exit 1; } + + npm run build:all --prefix ui2abc # Link libarkts echo "Linking @koalaui/libarkts..." -- Gitee From a2680b77d91d8e0af24df72a78f73a5c87db3cbd Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Fri, 6 Jun 2025 17:44:23 +0300 Subject: [PATCH 06/14] CI-Cleanup --- 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 ab415f1106..e78d5c5b15 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -287,7 +287,7 @@ install node modules (arkoala-arkts): npm run reinstall:regenerate npm run compile || { echo "❌ Build failed"; exit 1; } - npm run build:all --prefix ui2abc + npm run build:all --prefix ../../ui2abc # Link libarkts echo "Linking @koalaui/libarkts..." -- Gitee From a73d6c969bb00e281f8b9712724c78bceb497206 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 12:07:30 +0300 Subject: [PATCH 07/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index e78d5c5b15..9d0d0de148 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -227,6 +227,20 @@ install node modules (arkoala-arkts): - arkoala-arkts-arm32.har expire_in: 1 day + +что здесь провоцирует эту ошибку +[fast-arktsc] File /builds/rri_opensource/koala_projects/arkoala-arkts/arkui-common/build-m3/memo-checked/index.[ts|ets] does not exists +npm error Lifecycle script `build:sdk-m3:restart` failed with error: +npm error Error: command failed +npm error in workspace: @ohos/arkui@1.5.15-dev +npm error at location: /builds/rri_opensource/koala_projects/arkoala-arkts/arkui +npm error Lifecycle script `build:sdk-m3` failed with error: +npm error Error: command failed +npm error in workspace: @ohos/arkui@1.5.15-dev +npm error at location: /builds/rri_opensource/koala_projects/arkoala-arkts/arkui +❌ Failed to build M3 SDK + + user-32-m3.har: stage: build interruptible: true @@ -311,6 +325,18 @@ install node modules (arkoala-arkts): exit 1 fi + # Build arkui-common first + echo "🔄 Building arkui-common..." + cd arkoala-arkts/arkui-common || { echo "❌ Failed to cd to arkui-common"; exit 1; } + npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } + npm run build || { echo "❌ Failed to build arkui-common"; exit 1; } + cd "$CI_PROJECT_DIR" || exit 1 + + # Create required directories + echo "🔄 Creating required directories..." + mkdir -p arkoala-arkts/arkui-common/build-m3/memo-checked || { echo "❌ Failed to create memo-checked dir"; exit 1; } + touch arkoala-arkts/arkui-common/build-m3/memo-checked/index.ets || { echo "❌ Failed to create index.ets"; exit 1; } + # Build M3 SDK first echo "🔄 Building M3 SDK..." cd arkoala-arkts/arkui || { echo "❌ Failed to cd to arkui directory"; exit 1; } -- Gitee From 8f649b4931ac5d1ab342bfc5279e8da32d60a653 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 12:11:18 +0300 Subject: [PATCH 08/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 9d0d0de148..e488e9a65c 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -227,20 +227,6 @@ install node modules (arkoala-arkts): - arkoala-arkts-arm32.har expire_in: 1 day - -что здесь провоцирует эту ошибку -[fast-arktsc] File /builds/rri_opensource/koala_projects/arkoala-arkts/arkui-common/build-m3/memo-checked/index.[ts|ets] does not exists -npm error Lifecycle script `build:sdk-m3:restart` failed with error: -npm error Error: command failed -npm error in workspace: @ohos/arkui@1.5.15-dev -npm error at location: /builds/rri_opensource/koala_projects/arkoala-arkts/arkui -npm error Lifecycle script `build:sdk-m3` failed with error: -npm error Error: command failed -npm error in workspace: @ohos/arkui@1.5.15-dev -npm error at location: /builds/rri_opensource/koala_projects/arkoala-arkts/arkui -❌ Failed to build M3 SDK - - user-32-m3.har: stage: build interruptible: true -- Gitee From 1f13b1ae1355a6bcc6fc832b43a255dbd40b28a7 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 13:26:52 +0300 Subject: [PATCH 09/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index e488e9a65c..c1e4c86736 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -227,11 +227,13 @@ install node modules (arkoala-arkts): - arkoala-arkts-arm32.har expire_in: 1 day + user-32-m3.har: stage: build interruptible: true extends: - .linux-vm-shell-task + when: on_success needs: - install node modules (ui2abc) - install node modules (arkoala) -- Gitee From d403357162e03f5f5087116cbc9211ce4ccd84e9 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 13:40:22 +0300 Subject: [PATCH 10/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index c1e4c86736..d63e42f371 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -313,17 +313,17 @@ install node modules (arkoala-arkts): exit 1 fi - # Build arkui-common first - echo "🔄 Building arkui-common..." - cd arkoala-arkts/arkui-common || { echo "❌ Failed to cd to arkui-common"; exit 1; } - npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } - npm run build || { echo "❌ Failed to build arkui-common"; exit 1; } - cd "$CI_PROJECT_DIR" || exit 1 - - # Create required directories - echo "🔄 Creating required directories..." - mkdir -p arkoala-arkts/arkui-common/build-m3/memo-checked || { echo "❌ Failed to create memo-checked dir"; exit 1; } - touch arkoala-arkts/arkui-common/build-m3/memo-checked/index.ets || { echo "❌ Failed to create index.ets"; exit 1; } + # # Build arkui-common first + # echo "🔄 Building arkui-common..." + # cd arkoala-arkts/arkui-common || { echo "❌ Failed to cd to arkui-common"; exit 1; } + # npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } + # npm run build || { echo "❌ Failed to build arkui-common"; exit 1; } + # cd "$CI_PROJECT_DIR" || exit 1 + + # # Create required directories + # echo "🔄 Creating required directories..." + # mkdir -p arkoala-arkts/arkui-common/build-m3/memo-checked || { echo "❌ Failed to create memo-checked dir"; exit 1; } + # touch arkoala-arkts/arkui-common/build-m3/memo-checked/index.ets || { echo "❌ Failed to create index.ets"; exit 1; } # Build M3 SDK first echo "🔄 Building M3 SDK..." -- Gitee From 7bb36a883398dc0fe9a876d051b9a1c0f82f993d Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 13:57:28 +0300 Subject: [PATCH 11/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 7056e40410..dcf8bd6297 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -495,17 +495,17 @@ install node modules (arkoala-arkts): exit 1 fi - # # Build arkui-common first - # echo "🔄 Building arkui-common..." - # cd arkoala-arkts/arkui-common || { echo "❌ Failed to cd to arkui-common"; exit 1; } - # npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } - # npm run build || { echo "❌ Failed to build arkui-common"; exit 1; } - # cd "$CI_PROJECT_DIR" || exit 1 - - # # Create required directories - # echo "🔄 Creating required directories..." - # mkdir -p arkoala-arkts/arkui-common/build-m3/memo-checked || { echo "❌ Failed to create memo-checked dir"; exit 1; } - # touch arkoala-arkts/arkui-common/build-m3/memo-checked/index.ets || { echo "❌ Failed to create index.ets"; exit 1; } + # Build arkui-common first + echo "🔄 Building arkui-common..." + cd arkoala-arkts/arkui-common || { echo "❌ Failed to cd to arkui-common"; exit 1; } + npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } + npm run build || { echo "❌ Failed to build arkui-common"; exit 1; } + cd "$CI_PROJECT_DIR" || exit 1 + + # Create required directories + echo "🔄 Creating required directories..." + mkdir -p arkoala-arkts/arkui-common/build-m3/memo-checked || { echo "❌ Failed to create memo-checked dir"; exit 1; } + touch arkoala-arkts/arkui-common/build-m3/memo-checked/index.ets || { echo "❌ Failed to create index.ets"; exit 1; } # Build M3 SDK first echo "🔄 Building M3 SDK..." -- Gitee From 497d5bc665f32b4865671b40cd7b0b8e92e903b5 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 14:44:56 +0300 Subject: [PATCH 12/14] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index dcf8bd6297..aaf0b28947 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -428,6 +428,11 @@ install node modules (arkoala-arkts): - build ArkoalaNative (linux, ohos-arm32, hzvm+panda) before_script: - !reference [.setup, script] + + - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs + - node --version + - npm --version + - | npm run compile --prefix ui2abc/fast-arktsc -- Gitee From fada9ac85303c7acacc8b2e1dd500869f8915d96 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 15:28:49 +0300 Subject: [PATCH 13/14] CI-Cleanup --- 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 aaf0b28947..45700ec7cc 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -503,7 +503,7 @@ install node modules (arkoala-arkts): # Build arkui-common first echo "🔄 Building arkui-common..." cd arkoala-arkts/arkui-common || { echo "❌ Failed to cd to arkui-common"; exit 1; } - npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } + # npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } npm run build || { echo "❌ Failed to build arkui-common"; exit 1; } cd "$CI_PROJECT_DIR" || exit 1 -- Gitee From f26fbc1617ee31ef3593dde43ff01daf0d093ac6 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 15:54:17 +0300 Subject: [PATCH 14/14] CI-Cleanup --- 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 45700ec7cc..b95835d92d 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -504,7 +504,7 @@ install node modules (arkoala-arkts): echo "🔄 Building arkui-common..." cd arkoala-arkts/arkui-common || { echo "❌ Failed to cd to arkui-common"; exit 1; } # npm install || { echo "❌ Failed to install arkui-common deps"; exit 1; } - npm run build || { echo "❌ Failed to build arkui-common"; exit 1; } + npm run build:arkui-common:inc:ui2abc:recheck || { echo "❌ Failed to build arkui-common"; exit 1; } cd "$CI_PROJECT_DIR" || exit 1 # Create required directories -- Gitee