diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index f62642a23f5f839cd5a8c6506edad26dbdecf0a8..aaaa07fef1cb9651ed71f68ff938e38cc3e708be 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -118,16 +118,15 @@ install node modules (arkoala-arkts): expire_in: 1 day build compat (w/plugin): - allow_failure: true stage: build interruptible: true extends: - .linux-vm-shell-task needs: - - install node modules (arkoala) - 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 @@ -136,16 +135,15 @@ install node modules (arkoala-arkts): - npm run build:compat:inc:capi --prefix incremental/compat build common (w/plugin): - allow_failure: true stage: build interruptible: true extends: - .linux-vm-shell-task needs: - - install node modules (arkoala) - 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 diff --git a/arkoala-arkts/libarkts/.gitlab-ci.yml b/arkoala-arkts/libarkts/.gitlab-ci.yml index faf0305b32e70f2c38eefe16e2f33d0ab2fa7c0f..56f44462010b5926176ed266f6346a234f4d4ae3 100644 --- a/arkoala-arkts/libarkts/.gitlab-ci.yml +++ b/arkoala-arkts/libarkts/.gitlab-ci.yml @@ -11,8 +11,22 @@ # See the License for the specific language governing permissions and # limitations under the License. +regenerate plugin-api: + interruptible: true + stage: build + extends: .linux-vm-shell-task + before_script: + - !reference [ .setup, script ] + - cd arkoala-arkts/libarkts + - npm run panda:sdk:install + script: + - npm run regenerate + needs: + - install node modules (arkoala-arkts) + - install node modules (incremental) + - install node modules (interop) + build plugin-api: - allow_failure: true interruptible: true stage: build extends: .linux-vm-shell-task @@ -26,9 +40,9 @@ build plugin-api: - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api test plugin-api: - allow_failure: true interruptible: true stage: test extends: .linux-vm-shell-task @@ -42,9 +56,9 @@ test plugin-api: - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api test example arkts-plugin: - allow_failure: true interruptible: true stage: test extends: .linux-vm-shell-task @@ -60,7 +74,6 @@ test example arkts-plugin: - install node modules (interop) test libarkts playground: - allow_failure: true interruptible: true stage: test extends: .linux-vm-shell-task @@ -74,5 +87,6 @@ test libarkts playground: - install node modules (arkoala-arkts) - install node modules (incremental) - install node modules (interop) + - regenerate plugin-api diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json index e471f1bb9fb7bfee1ff698641e7db316e6755f33..55d803ed21d2c27b562f3ff3f595bca07649feeb 100644 --- a/arkoala-arkts/libarkts/package.json +++ b/arkoala-arkts/libarkts/package.json @@ -18,21 +18,24 @@ }, "scripts": { "clean": "rimraf build native/build*", - "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", "compile:koala:interop": "npm run --prefix ../../interop compile", "compile:meson": "cd native && meson setup build && meson compile -C build", "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda.node ./build/native/build", "compile:native": "npm run compile:koala:interop && npm run compile:meson && npm run copy:.node", "compile:src": "npx ets-tsc -p ./tsconfig.json", "compile": "npm run compile:native && npm run compile:src", - "compile:plugin": "npx ets-tsc -p plugins/tsconfig.json", + "compile:plugins": "npx ets-tsc -p plugins/tsconfig.json", "run:js": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk node . --file ./plugins/input/main.sts --arktsconfig ./arktsconfig.json --output ./build/abc/main.abc --dump-plugin-ast", - "run": "npm run compile && npm run compile:plugin && npm run run:js", + "run": "npm run compile && npm run compile:plugins && npm run run:js", + "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main", "mocha": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0", "test": "npm run compile:native && npm run mocha", - "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main", "compile:playground": "cd playground && meson setup build && meson compile -C build", "run:playground": "npm run compile:playground && ./playground/build/playground.out", - "regenerate": "npx @idlizer/libarkts-gen@$npm_package_config_gen_version --input-file $npm_package_config_input_file --output-dir ../ --files bridges,nativeModule" + "panda:sdk:clean": "cd ../../incremental/tools/panda && rimraf node_modules", + "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", + "panda:sdk:reinstall": "npm run panda:sdk:clean && npm run panda:sdk:install", + "regenerate": "npx @idlizer/libarkts-gen@$npm_package_config_gen_version --input-file $npm_package_config_input_file --output-dir ../ --files bridges,nativeModule", + "reinstall:regenerate": "npm run panda:sdk:reinstall && npm run regenerate" } } diff --git a/gitlab/setup.yml b/gitlab/setup.yml index a83191b8aba9ca80b53e268d3ad1fe4dcc3e6cb3..a04c621a2d391e0b6bd99d75e40dee7492f852b1 100644 --- a/gitlab/setup.yml +++ b/gitlab/setup.yml @@ -6,7 +6,7 @@ - npm config set @koalaui: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 @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 @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