From 1c8553a2ad9362f535a6c68d6f45699c779d1ac8 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Mon, 9 Jun 2025 17:53:45 +0300 Subject: [PATCH 1/3] 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 90ade3b6a..1e410357a 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -530,7 +530,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 edc338348c84c68da16d3deb56ea49fcced8e94a Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 11:43:25 +0300 Subject: [PATCH 2/3] CI-Cleanup --- arkoala-arkts/.gitlab-ci.yml | 118 ----------------------------------- 1 file changed, 118 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 1e410357a..d06343fb0 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 --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 --prefix arkoala-arkts/arkui - build incremental.abc: stage: build interruptible: true @@ -283,8 +192,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 - build incremental.abc - build interop.abc before_script: @@ -297,28 +204,6 @@ 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) - 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 @@ -372,7 +257,6 @@ install node modules (arkoala-arkts): - install node modules (incremental) - install node modules (interop) - link arkoala.abc - - build user.abc - build ArkoalaNative (linux, linux, node+panda) before_script: - !reference [.setup, script] @@ -418,7 +302,6 @@ install node modules (arkoala-arkts): - install node modules (incremental) - install node modules (interop) - install node modules (tools) - - build user.abc before_script: - !reference [.setup, script] - npm run panda:sdk:install --prefix arkoala-arkts @@ -530,7 +413,6 @@ 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 62106d27f1f5ba3d46a64cee26cb4e3be8f10209 Mon Sep 17 00:00:00 2001 From: sokolovairina Date: Tue, 10 Jun 2025 15:34:31 +0300 Subject: [PATCH 3/3] build user.abc --- arkoala-arkts/.gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index d06343fb0..4608a8e44 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 -- Gitee