From 9c361045d1ac974fd024881f3b11df2d7e9ac4d7 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Mon, 17 Feb 2025 11:51:44 +0300 Subject: [PATCH 1/3] Trying to explicitly regenerate Signed-off-by: Alexander Gorshenev --- arkoala-arkts/libarkts/.gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arkoala-arkts/libarkts/.gitlab-ci.yml b/arkoala-arkts/libarkts/.gitlab-ci.yml index 56f444620..68ace4dd1 100644 --- a/arkoala-arkts/libarkts/.gitlab-ci.yml +++ b/arkoala-arkts/libarkts/.gitlab-ci.yml @@ -34,6 +34,7 @@ build plugin-api: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - npm run panda:sdk:install + - npm run regenerate script: - npm run compile needs: @@ -50,6 +51,7 @@ test plugin-api: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - npm run panda:sdk:install + - npm run regenerate script: - npm run test needs: @@ -66,6 +68,7 @@ test example arkts-plugin: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - npm run panda:sdk:install + - npm run regenerate script: - npm run run needs: @@ -81,6 +84,7 @@ test libarkts playground: - !reference [ .setup, script ] - cd arkoala-arkts/libarkts - npm run panda:sdk:install + - npm run regenerate script: - npm run run:playground needs: -- Gitee From 1c99301a8fe37e7102ab9d599cae3d381f60d430 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Mon, 17 Feb 2025 13:34:33 +0300 Subject: [PATCH 2/3] more Signed-off-by: Alexander Gorshenev --- arkoala-arkts/.gitlab-ci.yml | 15 +++++---------- arkoala-arkts/memo-plugin/.gitlab-ci.yml | 6 ++---- gitlab/setup.yml | 6 ++++++ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 99eba0be1..5686c8293 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -126,11 +126,9 @@ install node modules (arkoala-arkts): - 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 - - npm run compile --prefix arkoala-arkts/libarkts + - !reference [.setup, regenerate-plugin-api] script: - npm run build:compat:inc:capi --prefix incremental/compat @@ -143,11 +141,11 @@ install node modules (arkoala-arkts): - 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 - - npm run compile --prefix arkoala-arkts/libarkts + - cd arkoala-arkts/libarkts + - npm run reinstall:regenerate + - npm run compile script: - npm run build:common:inc:capi --prefix incremental/common @@ -160,12 +158,9 @@ install node modules (arkoala-arkts): - 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 - # need the library as well as the plugins built - - npm run run --prefix arkoala-arkts/libarkts + - !reference [.setup, regenerate-plugin-api] script: - npm run run:user:pure-sts --prefix arkoala-arkts/trivial/user diff --git a/arkoala-arkts/memo-plugin/.gitlab-ci.yml b/arkoala-arkts/memo-plugin/.gitlab-ci.yml index 51db6fa47..0f78f448c 100644 --- a/arkoala-arkts/memo-plugin/.gitlab-ci.yml +++ b/arkoala-arkts/memo-plugin/.gitlab-ci.yml @@ -10,8 +10,7 @@ build memo-plugin: - install node modules (interop) before_script: - !reference [.setup, script] - - npm run panda:sdk:install --prefix arkoala-arkts/libarkts - - npm run compile --prefix arkoala-arkts/libarkts + - !reference [.setup, regenerate-plugin-api] script: - npm run compile --prefix arkoala-arkts/memo-plugin @@ -28,13 +27,12 @@ test memo-plugin: - build incremental.abc before_script: - !reference [.setup, script] + - !reference [.setup, regenerate-plugin-api] - npm run compile:all --prefix incremental/compat - npm run compile --prefix incremental/common - npm run compile --prefix incremental/compiler-plugin - npm run compile --prefix incremental/runtime - npm run unmemoize --prefix incremental/runtime - - npm run panda:sdk:install --prefix arkoala-arkts/libarkts - - npm run compile --prefix arkoala-arkts/libarkts - npm run compile --prefix arkoala-arkts/memo-plugin script: - npm run demo:run --prefix arkoala-arkts/memo-plugin diff --git a/gitlab/setup.yml b/gitlab/setup.yml index a04c621a2..900f68433 100644 --- a/gitlab/setup.yml +++ b/gitlab/setup.yml @@ -9,6 +9,12 @@ - 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 + regenerate-plugin-api: + - cd arkoala-arkts/libarkts + - npm run reinstall:regenerate + - npm run compile + - npm run compile:plugins + - cd - .linux-vm-shell-task: tags: -- Gitee From 7e18c30cd9e5e5bee59747d7cfbe3f4ba1ec5e31 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Mon, 17 Feb 2025 15:56:18 +0300 Subject: [PATCH 3/3] more Signed-off-by: Alexander Gorshenev --- arkoala-arkts/.gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 5686c8293..141082cdc 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -143,9 +143,7 @@ install node modules (arkoala-arkts): - install node modules (interop) before_script: - !reference [.setup, script] - - cd arkoala-arkts/libarkts - - npm run reinstall:regenerate - - npm run compile + - !reference [.setup, regenerate-plugin-api] script: - npm run build:common:inc:capi --prefix incremental/common -- Gitee