From 377cd2401f70b5341587803d76f73a2c1825e347 Mon Sep 17 00:00:00 2001 From: Tatiana Titova Date: Fri, 29 Nov 2024 10:43:11 +0300 Subject: [PATCH 1/2] Use environment var for repo Signed-off-by: Tatiana Titova --- arkoala/ohos-sdk/scripts/openlab.mjs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arkoala/ohos-sdk/scripts/openlab.mjs b/arkoala/ohos-sdk/scripts/openlab.mjs index c28d6bfe4..46aef9355 100644 --- a/arkoala/ohos-sdk/scripts/openlab.mjs +++ b/arkoala/ohos-sdk/scripts/openlab.mjs @@ -18,6 +18,7 @@ import process from "process" import { http_archive, http_file } from "./http-archive.mjs" import { execCmd } from "./utils.mjs" +const KOALA_REPO = process.env.KOALA_REPO const NEXUS_NPM_PASS = process.env.NEXUS_NPM_PASS const OPENLAB_USERNAME = process.env.OPENLAB_USERNAME const OPENLAB_PASSWORD = process.env.OPENLAB_PASSWORD @@ -38,9 +39,14 @@ function getHeaders() { } } +function get_koala_repo() { + if (KOALA_REPO) + return KOALA_REPO; + return 'https://nexus.bz-openlab.ru:10443/repository/koala-raw/' +} function get_generic_package_url(name, version, file) { - const host = 'https://nexus.bz-openlab.ru:10443/repository/koala-raw/' + const host = get_koala_repo(); return host + name + '/' + version + '/' + file } @@ -79,4 +85,4 @@ export async function generic_package_upload_openlab(packageName, packageVersion "--upload-file", filePath, `https://nexus.bz-openlab.ru:10443/repository/koala-raw/${packageName}/${packageVersion}/${fileName}` ]) -} \ No newline at end of file +} -- Gitee From 2f2bfb33e7d46b59a1d79ffd51ad5a07ecfb2d54 Mon Sep 17 00:00:00 2001 From: Tatiana Titova Date: Thu, 12 Dec 2024 15:24:09 +0300 Subject: [PATCH 2/2] Fix trivial:all:node:ci Signed-off-by: Tatiana Titova --- arkoala-arkts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index 6ec9f31d3..40671402e 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -58,7 +58,7 @@ "build:shopping": "npm run build:shopping --prefix shopping && mkdir -p ./build && cp -r shopping/build/shopping.abc ./build/", "run:node:user": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp", "run:node:shopping": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ShoppingApp", - "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda 10", + "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp 10", "trivial:all:node": "npm run compile:native:node-host && npm run build:arkoala && npm run build:user && npm run build:loader:node && npm run run:node:user", "trivial:node": "npm run build:user && npm run build:loader:node && npm run run:node:user", "shopping:all:node": "npm run compile:native:node-host && npm run build:arkoala && npm run build:shopping && npm run build:loader:node && npm run run:node:shopping", -- Gitee