From c59a7c8610e624e01f74d85c7334c00ec3122d49 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Wed, 16 Oct 2024 14:52:56 +0300
Subject: [PATCH 01/17] pack-arkoala-arkts-har

---
 .gitlab-ci.yml                   |  2 ++
 arkoala-arkts/har/.gitlab-ci.yml | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 arkoala-arkts/har/.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0dfa076d..7ea930f21 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 000000000..ae5ae0dba
--- /dev/null
+++ b/arkoala-arkts/har/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+pack arkoala-arkts har-arm32 (linux):
+    stage: pack
+    interruptible: true
+    extends:
+        - .linux-vm-shell-task
+    needs: []
+    script:
+        - !reference [.setup, script]
+        - cd 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
+    artifacts:
+        - arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har
-- 
Gitee


From 3918e33146f0a1730b902e8b37e23d42f783edba Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Wed, 16 Oct 2024 15:27:55 +0300
Subject: [PATCH 02/17] empty

-- 
Gitee


From bb733b8669e4374bd972b5eb20728652d85983d1 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Wed, 16 Oct 2024 15:49:10 +0300
Subject: [PATCH 03/17] fix

---
 arkoala-arkts/har/.gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml
index ae5ae0dba..f48543a3e 100644
--- a/arkoala-arkts/har/.gitlab-ci.yml
+++ b/arkoala-arkts/har/.gitlab-ci.yml
@@ -7,5 +7,8 @@ pack arkoala-arkts har-arm32 (linux):
     script:
         - !reference [.setup, script]
         - cd 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
+        - cp $CI_PROJECT_DIR/arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har $CI_PROJECT_DIR/arkoala-arkts.har
     artifacts:
-        - arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har
+        expire_in: 1 week
+        paths:
+            - arkoala-arkts.har
-- 
Gitee


From 75bb466b35e7ad08e6903ec854bdb3de66e76f2e Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Wed, 16 Oct 2024 16:04:41 +0300
Subject: [PATCH 04/17] fix

---
 arkoala-arkts/har/.gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml
index f48543a3e..1e920ad48 100644
--- a/arkoala-arkts/har/.gitlab-ci.yml
+++ b/arkoala-arkts/har/.gitlab-ci.yml
@@ -6,7 +6,8 @@ pack arkoala-arkts har-arm32 (linux):
     needs: []
     script:
         - !reference [.setup, script]
-        - cd 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
+        - 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
-- 
Gitee


From 9fdc1fc41e8216c783f9501f501d2e762635f1c7 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Wed, 16 Oct 2024 16:32:35 +0300
Subject: [PATCH 05/17] panda registry

---
 gitlab/setup.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitlab/setup.yml b/gitlab/setup.yml
index 69a5a5008..2ca2710d3 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 .. 
-- 
Gitee


From 30e3ca0458f000bd8561d80a8d4be2dc2177622d Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Wed, 16 Oct 2024 17:25:09 +0300
Subject: [PATCH 06/17] show panda sdk version

---
 incremental/tools/panda/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/incremental/tools/panda/package.json b/incremental/tools/panda/package.json
index 46fdec4bd..912bdca35 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"
     }
-- 
Gitee


From aad7aa2c07d594dd6e7743c8466ef915870b2152 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 21 Oct 2024 11:33:14 +0300
Subject: [PATCH 07/17] fix for current master

---
 arkoala-arkts/har/package.json                  | 2 +-
 arkoala-arkts/har/scripts/build-arkoala-har.mjs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arkoala-arkts/har/package.json b/arkoala-arkts/har/package.json
index 9c4c0b79e..421cc1324 100644
--- a/arkoala-arkts/har/package.json
+++ b/arkoala-arkts/har/package.json
@@ -20,7 +20,7 @@
         "clean": "rimraf app/arkoala/build app/arkoala/libs 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 --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",
+        "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 e9b9b0afd..2f1b63a3c 100644
--- a/arkoala-arkts/har/scripts/build-arkoala-har.mjs
+++ b/arkoala-arkts/har/scripts/build-arkoala-har.mjs
@@ -33,7 +33,7 @@ function main() {
 
     /* 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(CWD, "../arkui/arkoala-arkui.abc"), path.join(HAR_PATH, `libs/armeabi-v7a/arkoala-arkui.abc.so`))
+    copyFilesToHar(path.join(CWD, "../arkui/arkoala.abc"), path.join(HAR_PATH, `libs/armeabi-v7a/arkoala.abc.so`))
 }
 
 main()
-- 
Gitee


From 6f9cfdd78048c8d4bd8b62f8ebda1b9b19876504 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 21 Oct 2024 11:48:24 +0300
Subject: [PATCH 08/17] test

---
 .gitlab-ci.yml          |  1 +
 tmpdir/.gitlab-ci.yml   | 11 +++++++++++
 tmpdir/arktsconfig.json |  6 ++++++
 tmpdir/foo.sts          |  3 +++
 tmpdir/package.json     |  6 ++++++
 5 files changed, 27 insertions(+)
 create mode 100644 tmpdir/.gitlab-ci.yml
 create mode 100644 tmpdir/arktsconfig.json
 create mode 100644 tmpdir/foo.sts
 create mode 100644 tmpdir/package.json

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ea930f21..851b4c70e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ include:
     - 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/tmpdir/.gitlab-ci.yml b/tmpdir/.gitlab-ci.yml
new file mode 100644
index 000000000..31fdc9f82
--- /dev/null
+++ b/tmpdir/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+test panda bz ci:
+    stage: test
+    interruptible: true
+    extends:
+        - .linux-vm-shell-task
+    needs: []
+    script:
+        - !reference [.setup, script]
+        - npm run panda:sdk:install --prefix incremental/tools/panda
+        - npm run compile:arkts --prefix tmpdir
+        - npm run run:arkts --prefix tmpdir
diff --git a/tmpdir/arktsconfig.json b/tmpdir/arktsconfig.json
new file mode 100644
index 000000000..548a1d2ad
--- /dev/null
+++ b/tmpdir/arktsconfig.json
@@ -0,0 +1,6 @@
+{
+    "compilerOptions": {
+        "outDir": "build/abc"
+    },
+    "include": ["./foo.sts"]
+}
diff --git a/tmpdir/foo.sts b/tmpdir/foo.sts
new file mode 100644
index 000000000..2c2d11582
--- /dev/null
+++ b/tmpdir/foo.sts
@@ -0,0 +1,3 @@
+function main() {
+    console.log(127)
+}
diff --git a/tmpdir/package.json b/tmpdir/package.json
new file mode 100644
index 000000000..aae39ff68
--- /dev/null
+++ b/tmpdir/package.json
@@ -0,0 +1,6 @@
+{
+    "scripts": {
+        "compile:arkts": "bash ../incremental/tools/panda/arkts/arktsc --arktsconfig arktsconfig.json",
+        "run:arkts": "bash ../incremental/tools/panda/arkts/ark build/abc/foo.abc --ark-boot-files build/abc"
+    }    
+}
-- 
Gitee


From 5d5eb289b34bd39a9cfb042f2c7908697dd6fb20 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 21 Oct 2024 12:39:20 +0300
Subject: [PATCH 09/17] common with arch

---
 incremental/tools/panda/arkts/common.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/incremental/tools/panda/arkts/common.js b/incremental/tools/panda/arkts/common.js
index 9ff866df3..6acbe6251 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}`)
     }
-- 
Gitee


From 36d042400f8f86254d149d94e6435e09acb3c59c Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 21 Oct 2024 14:17:25 +0300
Subject: [PATCH 10/17] test

---
 tmpdir/.gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tmpdir/.gitlab-ci.yml b/tmpdir/.gitlab-ci.yml
index 31fdc9f82..4466f6d49 100644
--- a/tmpdir/.gitlab-ci.yml
+++ b/tmpdir/.gitlab-ci.yml
@@ -8,4 +8,3 @@ test panda bz ci:
         - !reference [.setup, script]
         - npm run panda:sdk:install --prefix incremental/tools/panda
         - npm run compile:arkts --prefix tmpdir
-        - npm run run:arkts --prefix tmpdir
-- 
Gitee


From 84e9bfe8f10f8ba83b2726404e0749804904905c Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 21 Oct 2024 14:29:40 +0300
Subject: [PATCH 11/17] test

---
 tmpdir/.gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tmpdir/.gitlab-ci.yml b/tmpdir/.gitlab-ci.yml
index 4466f6d49..8ed91c24a 100644
--- a/tmpdir/.gitlab-ci.yml
+++ b/tmpdir/.gitlab-ci.yml
@@ -7,4 +7,5 @@ test panda bz ci:
     script:
         - !reference [.setup, script]
         - npm run panda:sdk:install --prefix incremental/tools/panda
+        - cp incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/lib/* incremental/tools/panda/node_modules/@panda/sdk/linux_arm64_host_tools/lib
         - npm run compile:arkts --prefix tmpdir
-- 
Gitee


From 4bbd4d22e10123d1f4d16588366feded2ce3ce09 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 28 Oct 2024 11:13:20 +0300
Subject: [PATCH 12/17] empty

-- 
Gitee


From e5cce9244f594fda22391f34f560dbe645f6302b Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 11 Nov 2024 11:54:54 +0300
Subject: [PATCH 13/17] check

-- 
Gitee


From 787e3828ac8b0398d78ba6b650f161d339de3195 Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 11 Nov 2024 12:18:17 +0300
Subject: [PATCH 14/17] fix copying

---
 tmpdir/.gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tmpdir/.gitlab-ci.yml b/tmpdir/.gitlab-ci.yml
index 8ed91c24a..4466f6d49 100644
--- a/tmpdir/.gitlab-ci.yml
+++ b/tmpdir/.gitlab-ci.yml
@@ -7,5 +7,4 @@ test panda bz ci:
     script:
         - !reference [.setup, script]
         - npm run panda:sdk:install --prefix incremental/tools/panda
-        - cp incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/lib/* incremental/tools/panda/node_modules/@panda/sdk/linux_arm64_host_tools/lib
         - npm run compile:arkts --prefix tmpdir
-- 
Gitee


From def03a6a0d2b59e6aa1246d69589ff35ac0ab18b Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 11 Nov 2024 13:04:28 +0300
Subject: [PATCH 15/17] fix panda sdk version

---
 arkoala-arkts/har/.gitlab-ci.yml | 4 ++--
 tmpdir/.gitlab-ci.yml            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml
index 1e920ad48..3b33dea7e 100644
--- a/arkoala-arkts/har/.gitlab-ci.yml
+++ b/arkoala-arkts/har/.gitlab-ci.yml
@@ -6,8 +6,8 @@ pack arkoala-arkts har-arm32 (linux):
     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
+        - npm run install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
+        - KOALA_BZ=1 HOS_SDK_HOME=../../arkoala/ohos-sdk/ohos-sdk 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
diff --git a/tmpdir/.gitlab-ci.yml b/tmpdir/.gitlab-ci.yml
index 4466f6d49..9e75b8d81 100644
--- a/tmpdir/.gitlab-ci.yml
+++ b/tmpdir/.gitlab-ci.yml
@@ -6,5 +6,5 @@ test panda bz ci:
     needs: []
     script:
         - !reference [.setup, script]
-        - npm run panda:sdk:install --prefix incremental/tools/panda
+        - npm run install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
         - npm run compile:arkts --prefix tmpdir
-- 
Gitee


From f21bd0cb9b24ca0fafb0dc4876d4f4dae276006b Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 11 Nov 2024 13:53:58 +0300
Subject: [PATCH 16/17] fix

---
 arkoala-arkts/har/.gitlab-ci.yml | 2 +-
 tmpdir/.gitlab-ci.yml            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml
index 3b33dea7e..5f4fb4510 100644
--- a/arkoala-arkts/har/.gitlab-ci.yml
+++ b/arkoala-arkts/har/.gitlab-ci.yml
@@ -6,7 +6,7 @@ pack arkoala-arkts har-arm32 (linux):
     needs: []
     script:
         - !reference [.setup, script]
-        - npm run install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
+        - npm install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
         - KOALA_BZ=1 HOS_SDK_HOME=../../arkoala/ohos-sdk/ohos-sdk 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:
diff --git a/tmpdir/.gitlab-ci.yml b/tmpdir/.gitlab-ci.yml
index 9e75b8d81..cefea4220 100644
--- a/tmpdir/.gitlab-ci.yml
+++ b/tmpdir/.gitlab-ci.yml
@@ -6,5 +6,6 @@ test panda bz ci:
     needs: []
     script:
         - !reference [.setup, script]
-        - npm run install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
+        - npm install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
         - npm run compile:arkts --prefix tmpdir
+        - npm run run:arkts --prefix tmpdir
-- 
Gitee


From 8d324a5631d7431e12fb7162b8412af6352752cc Mon Sep 17 00:00:00 2001
From: Igor Loginov <loginov.igor1@huawer-partners.com>
Date: Mon, 11 Nov 2024 14:29:49 +0300
Subject: [PATCH 17/17] test

---
 arkoala-arkts/har/.gitlab-ci.yml |  4 ++--
 arkoala-arkts/package.json       |  4 ++--
 tmpdir/.gitlab-ci.yml            | 11 -----------
 tmpdir/arktsconfig.json          |  6 ------
 tmpdir/foo.sts                   |  3 ---
 tmpdir/package.json              |  6 ------
 6 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 tmpdir/.gitlab-ci.yml
 delete mode 100644 tmpdir/arktsconfig.json
 delete mode 100644 tmpdir/foo.sts
 delete mode 100644 tmpdir/package.json

diff --git a/arkoala-arkts/har/.gitlab-ci.yml b/arkoala-arkts/har/.gitlab-ci.yml
index 5f4fb4510..edbeb1f0e 100644
--- a/arkoala-arkts/har/.gitlab-ci.yml
+++ b/arkoala-arkts/har/.gitlab-ci.yml
@@ -6,8 +6,8 @@ pack arkoala-arkts har-arm32 (linux):
     needs: []
     script:
         - !reference [.setup, script]
-        - npm install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
-        - KOALA_BZ=1 HOS_SDK_HOME=../../arkoala/ohos-sdk/ohos-sdk OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run trivial:all:har-arm32 --prefix arkoala-arkts
+        - 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
diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json
index dbfa0060d..dfce1ca0d 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/tmpdir/.gitlab-ci.yml b/tmpdir/.gitlab-ci.yml
deleted file mode 100644
index cefea4220..000000000
--- a/tmpdir/.gitlab-ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-test panda bz ci:
-    stage: test
-    interruptible: true
-    extends:
-        - .linux-vm-shell-task
-    needs: []
-    script:
-        - !reference [.setup, script]
-        - npm install @panda/sdk@1.5.0-dev.7123 --no-save --prefix incremental/tools/panda
-        - npm run compile:arkts --prefix tmpdir
-        - npm run run:arkts --prefix tmpdir
diff --git a/tmpdir/arktsconfig.json b/tmpdir/arktsconfig.json
deleted file mode 100644
index 548a1d2ad..000000000
--- a/tmpdir/arktsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "compilerOptions": {
-        "outDir": "build/abc"
-    },
-    "include": ["./foo.sts"]
-}
diff --git a/tmpdir/foo.sts b/tmpdir/foo.sts
deleted file mode 100644
index 2c2d11582..000000000
--- a/tmpdir/foo.sts
+++ /dev/null
@@ -1,3 +0,0 @@
-function main() {
-    console.log(127)
-}
diff --git a/tmpdir/package.json b/tmpdir/package.json
deleted file mode 100644
index aae39ff68..000000000
--- a/tmpdir/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "scripts": {
-        "compile:arkts": "bash ../incremental/tools/panda/arkts/arktsc --arktsconfig arktsconfig.json",
-        "run:arkts": "bash ../incremental/tools/panda/arkts/ark build/abc/foo.abc --ark-boot-files build/abc"
-    }    
-}
-- 
Gitee