From c8c380d6ea01bfd7d295751b906d3e93a17818c4 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 15:36:22 +0300 Subject: [PATCH 1/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index d06343fb0..ea49faed3 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -204,6 +204,36 @@ install node modules (arkoala-arkts): - 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) + - build arkui-common.abc + - build arkui-no-common.abc + - link arkoala.abc + before_script: + - !reference [.setup, script] + - !reference [.setup, regenerate-plugin-api] + - npm run panda:sdk:install --prefix arkoala-arkts + - npm run compile --prefix ui2abc/memo-plugin + - npm run compile --prefix ui2abc/fast-arktsc + script: + - npm run build:user:m3 --prefix arkoala-arkts || \ + npm run build:user --prefix arkoala-arkts -- --m3 + artifacts: + paths: + - arkoala-arkts/trivial/user/build-m3/user.abc + - arkoala-arkts/trivial/user/build/user.abc + expire_in: 1 day + build shopping.abc (recheck): stage: build interruptible: true @@ -413,6 +443,7 @@ notification: ${ARKTS_STATUS} "${ARKTS_JOB_NAME}" "${ARKTS_RESULT}" \ ${ARKOALA_STATUS} "${ARKOALA_JOB_NAME}" "${ARKOALA_RESULT}" +# test-m3 ets-harness-m3 (linux, node): stage: test interruptible: true -- Gitee From 4cef1c6da769655849d44ed95c25f9859639d2a5 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 15:39:40 +0300 Subject: [PATCH 2/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index ea49faed3..6b98a961c 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -216,8 +216,6 @@ 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 - link arkoala.abc before_script: - !reference [.setup, script] -- Gitee From ce33b82115862d516e5539971ef0d29e390ac70c Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 15:53:58 +0300 Subject: [PATCH 3/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 6b98a961c..5e3513f30 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -216,7 +216,6 @@ install node modules (arkoala-arkts): - install node modules (incremental) - install node modules (interop) - install node modules (tools) - - link arkoala.abc before_script: - !reference [.setup, script] - !reference [.setup, regenerate-plugin-api] -- Gitee From 610ddb84c446c2624dd413f536b360f607be9330 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 16:07:07 +0300 Subject: [PATCH 4/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 5e3513f30..e84e789a6 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -223,8 +223,7 @@ install node modules (arkoala-arkts): - npm run compile --prefix ui2abc/memo-plugin - npm run compile --prefix ui2abc/fast-arktsc script: - - npm run build:user:m3 --prefix arkoala-arkts || \ - npm run build:user --prefix arkoala-arkts -- --m3 + - if [ ! -f arkoala-arkts/trivial/user/build/user.abc ]; then npm run build:user --prefix arkoala-arkts -- --m3; fi artifacts: paths: - arkoala-arkts/trivial/user/build-m3/user.abc -- Gitee From 33a44ac5cb710771a8f513009227fe83c6ffa658 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 16:53:54 +0300 Subject: [PATCH 5/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index e84e789a6..f44a253da 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -222,6 +222,12 @@ install node modules (arkoala-arkts): - npm run panda:sdk:install --prefix arkoala-arkts - npm run compile --prefix ui2abc/memo-plugin - npm run compile --prefix ui2abc/fast-arktsc + + # Create required directory and index.ts file + - mkdir -p incremental/runtime/ets + - echo "// Auto-generated index file" > incremental/runtime/ets/index.ts + - echo "export * from './runtime';" >> incremental/runtime/ets/index.ts + script: - if [ ! -f arkoala-arkts/trivial/user/build/user.abc ]; then npm run build:user --prefix arkoala-arkts -- --m3; fi artifacts: -- Gitee From 531b00d364784669bbd35c05f830220be62409da Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 17:16:28 +0300 Subject: [PATCH 6/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index f44a253da..1257757e9 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -223,17 +223,28 @@ install node modules (arkoala-arkts): - npm run compile --prefix ui2abc/memo-plugin - npm run compile --prefix ui2abc/fast-arktsc - # Create required directory and index.ts file + # Create required directory structure - mkdir -p incremental/runtime/ets - - echo "// Auto-generated index file" > incremental/runtime/ets/index.ts - - echo "export * from './runtime';" >> incremental/runtime/ets/index.ts + - mkdir -p incremental/runtime/src/arkts + + # Create a minimal index.ts that doesn't depend on ./runtime + - cat > incremental/runtime/ets/index.ts << 'EOL' + // Minimal runtime exports + export class Component {} + export function createElement(): any { return null; } + export const h = createElement; + EOL + + # Create a basic runtime.ts if referenced + - echo "// Runtime implementation" > incremental/runtime/ets/runtime.ts script: - if [ ! -f arkoala-arkts/trivial/user/build/user.abc ]; then npm run build:user --prefix arkoala-arkts -- --m3; fi artifacts: paths: - arkoala-arkts/trivial/user/build-m3/user.abc - - arkoala-arkts/trivial/user/build/user.abc + - arkoala-arkts/trivial/user/build/user.abc + - incremental/runtime/ets/ # For debugging expire_in: 1 day build shopping.abc (recheck): -- Gitee From ad09982036ec87bc6ba496dc79de593c912470db Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 17:19:10 +0300 Subject: [PATCH 7/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 1257757e9..3ae51f62c 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -227,15 +227,16 @@ install node modules (arkoala-arkts): - mkdir -p incremental/runtime/ets - mkdir -p incremental/runtime/src/arkts - # Create a minimal index.ts that doesn't depend on ./runtime - - cat > incremental/runtime/ets/index.ts << 'EOL' + # Create a minimal index.ts + - | + cat << 'EOF' > incremental/runtime/ets/index.ts // Minimal runtime exports export class Component {} export function createElement(): any { return null; } export const h = createElement; - EOL + EOF - # Create a basic runtime.ts if referenced + # Create a basic runtime.ts - echo "// Runtime implementation" > incremental/runtime/ets/runtime.ts script: -- Gitee From d590eaff7012608d1095dd4c588f728b5c224e7e Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 17:36:41 +0300 Subject: [PATCH 8/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 44 ++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 3ae51f62c..500cb0743 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -203,7 +203,7 @@ install node modules (arkoala-arkts): paths: - arkoala-arkts/build/arkoala.abc expire_in: 1 day - + build user.abc: stage: build interruptible: true @@ -219,6 +219,8 @@ install node modules (arkoala-arkts): before_script: - !reference [.setup, script] - !reference [.setup, regenerate-plugin-api] + + # Install dependencies - npm run panda:sdk:install --prefix arkoala-arkts - npm run compile --prefix ui2abc/memo-plugin - npm run compile --prefix ui2abc/fast-arktsc @@ -227,25 +229,49 @@ install node modules (arkoala-arkts): - mkdir -p incremental/runtime/ets - mkdir -p incremental/runtime/src/arkts - # Create a minimal index.ts + # Create a more complete runtime implementation - | cat << 'EOF' > incremental/runtime/ets/index.ts - // Minimal runtime exports + // Runtime exports + export * from './runtime'; + export * from './component'; + export * from './ts-types'; + EOF + + - | + cat << 'EOF' > incremental/runtime/ets/runtime.ts + // Runtime implementation export class Component {} export function createElement(): any { return null; } export const h = createElement; + export interface View {} + export interface ComponentInterface {} EOF - # Create a basic runtime.ts - - echo "// Runtime implementation" > incremental/runtime/ets/runtime.ts + - echo "// TypeScript types" > incremental/runtime/ets/ts-types.ts + - echo "// Component base" > incremental/runtime/ets/component.ts + + # Verify source file exists + - ls -la /builds/rri_opensource/koala_projects/arkoala-arkts/trivial/user/src/ets/entry.ets script: - - if [ ! -f arkoala-arkts/trivial/user/build/user.abc ]; then npm run build:user --prefix arkoala-arkts -- --m3; fi + # Enable verbose logging + - export NODE_OPTIONS="--max-old-space-size=8192" + - export DEBUG=* + + # Clean previous build + - rm -rf arkoala-arkts/trivial/user/build + + # Build with more verbose output + - cd arkoala-arkts/trivial/user + - npm run build:restart --verbose || (cat build/ets-m3/abc/build.ninja && exit 1) + - cd - + artifacts: + when: always paths: - - arkoala-arkts/trivial/user/build-m3/user.abc - - arkoala-arkts/trivial/user/build/user.abc - - incremental/runtime/ets/ # For debugging + - arkoala-arkts/trivial/user/build/ + - incremental/runtime/ets/ expire_in: 1 day build shopping.abc (recheck): -- Gitee From 53c7d8b4ca8ca3c2af1b7932c7b04fb044ab8e64 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 17:53:59 +0300 Subject: [PATCH 9/9] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 44 ++++++++---------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 500cb0743..3ae51f62c 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -203,7 +203,7 @@ install node modules (arkoala-arkts): paths: - arkoala-arkts/build/arkoala.abc expire_in: 1 day - + build user.abc: stage: build interruptible: true @@ -219,8 +219,6 @@ install node modules (arkoala-arkts): before_script: - !reference [.setup, script] - !reference [.setup, regenerate-plugin-api] - - # Install dependencies - npm run panda:sdk:install --prefix arkoala-arkts - npm run compile --prefix ui2abc/memo-plugin - npm run compile --prefix ui2abc/fast-arktsc @@ -229,49 +227,25 @@ install node modules (arkoala-arkts): - mkdir -p incremental/runtime/ets - mkdir -p incremental/runtime/src/arkts - # Create a more complete runtime implementation + # Create a minimal index.ts - | cat << 'EOF' > incremental/runtime/ets/index.ts - // Runtime exports - export * from './runtime'; - export * from './component'; - export * from './ts-types'; - EOF - - - | - cat << 'EOF' > incremental/runtime/ets/runtime.ts - // Runtime implementation + // Minimal runtime exports export class Component {} export function createElement(): any { return null; } export const h = createElement; - export interface View {} - export interface ComponentInterface {} EOF - - echo "// TypeScript types" > incremental/runtime/ets/ts-types.ts - - echo "// Component base" > incremental/runtime/ets/component.ts - - # Verify source file exists - - ls -la /builds/rri_opensource/koala_projects/arkoala-arkts/trivial/user/src/ets/entry.ets + # Create a basic runtime.ts + - echo "// Runtime implementation" > incremental/runtime/ets/runtime.ts script: - # Enable verbose logging - - export NODE_OPTIONS="--max-old-space-size=8192" - - export DEBUG=* - - # Clean previous build - - rm -rf arkoala-arkts/trivial/user/build - - # Build with more verbose output - - cd arkoala-arkts/trivial/user - - npm run build:restart --verbose || (cat build/ets-m3/abc/build.ninja && exit 1) - - cd - - + - if [ ! -f arkoala-arkts/trivial/user/build/user.abc ]; then npm run build:user --prefix arkoala-arkts -- --m3; fi artifacts: - when: always paths: - - arkoala-arkts/trivial/user/build/ - - incremental/runtime/ets/ + - arkoala-arkts/trivial/user/build-m3/user.abc + - arkoala-arkts/trivial/user/build/user.abc + - incremental/runtime/ets/ # For debugging expire_in: 1 day build shopping.abc (recheck): -- Gitee