From 787a098cd51f7a8d7f93a044ff5ee9f7493c386f Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:11:29 +0000 Subject: [PATCH 01/10] update .gitee/ISSUE_TEMPLATE/bug.yml. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- .gitee/ISSUE_TEMPLATE/bug.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 9541337..f450c5f 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -50,6 +50,7 @@ body: options: - 1.0.2 (默认) - 1.0.3 (迭代) - - 1.0.4 (最新) + - 1.0.4 (迭代) + - 1.1 (最新)= validations: required: true \ No newline at end of file -- Gitee From bed123424c2a1fe8821ae00c765c4ea484848f4c Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:13:39 +0000 Subject: [PATCH 02/10] update README.md. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9825770..98ef821 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ https://www.hikunpeng.com/document/detail/zh/nativedevp/userguide/devkitpipepre/ ###### 1.下载原生开发流水线工具安装包并解压 ``` -目前支持版本（1.0.1、1.0.2、1.0.3、1.0.4） +目前支持版本（1.0.1、1.0.2、1.0.3、1.0.4, 1.1） wget -c https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.x/devkit-pipeline-v1.0.x.tar.gz && tar -xzvf devkit-pipeline-v1.0.x.tar.gz ``` ###### 2.进入`devkit-pipeline-v1.0.x/linux`文件夹，根据实际情况修改machine.yaml配置文件，以下是具体配置项说明 -- Gitee From e20350b692bbb102aad4a4e0fed140af2b075c62 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:14:00 +0000 Subject: [PATCH 03/10] =?UTF-8?q?update=20Binscope=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8C=87=E5=8D=97.md.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: devkit-pipeline <3361635964@qq.com> --- "Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" "b/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" index 5a5ce11..e680be6 100644 --- "a/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" +++ "b/Binscope\347\224\250\346\210\267\346\214\207\345\215\227.md" @@ -94,8 +94,8 @@ Binscope支持将扫描结果直接打印在屏幕上，也支持输出JSON格 |软件包名称|链接| |:-|--| -|binscope_aarch64.tar.gz| https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/binscope_aarch64.tar.gz | -|binscope_x86_64.tar.gz|https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/binscope_x86_64.tar.gz| +|binscope_aarch64.tar.gz| https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/binscope_aarch64.tar.gz | +|binscope_x86_64.tar.gz|https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/binscope_x86_64.tar.gz| **部署** -- Gitee From 7755af13c01052c43421dae78dab3033dd88b7ab Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:14:29 +0000 Subject: [PATCH 04/10] update build.sh. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 1fc8e07..e09b24d 100644 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ set -e current_dir=$(cd $(dirname "$0"); pwd) -tag="v1.0.4" +tag="v1.1" rm -rf "${current_dir}"/build mkdir -p "${current_dir}"/build -- Gitee From 6ff496d2daadcc5b99ef500e31ff5041dc55c311 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:14:52 +0000 Subject: [PATCH 05/10] update component/DevKitCLI/check_install_result.sh. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- component/DevKitCLI/check_install_result.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/DevKitCLI/check_install_result.sh b/component/DevKitCLI/check_install_result.sh index 1891d28..db3af57 100644 --- a/component/DevKitCLI/check_install_result.sh +++ b/component/DevKitCLI/check_install_result.sh @@ -1,7 +1,7 @@ #!/bin/bash devkit_path=$(which devkit) -if [[ ${devkit_path} == ${HOME}/.local/DevKit-CLI-24.0.RC3-Linux-Kunpeng/devkit ]]; then +if [[ ${devkit_path} == ${HOME}/.local/DevKit-CLI-24.0.T50-Linux-Kunpeng/devkit ]]; then echo "true" else echo "false" -- Gitee From 00021bd766dea90563043f5a7b5b290bb1b1cd2a Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:15:38 +0000 Subject: [PATCH 06/10] update component/DevKitCLI/install.sh. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- component/DevKitCLI/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/component/DevKitCLI/install.sh b/component/DevKitCLI/install.sh index 390fc6f..7ebad08 100644 --- a/component/DevKitCLI/install.sh +++ b/component/DevKitCLI/install.sh @@ -4,14 +4,14 @@ cd /tmp/devkitdependencies/ function main() { mkdir -p ${HOME}/.local - echo "Decompress DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz to ${HOME}/.local" - tar --no-same-owner -zxf /tmp/devkitdependencies/DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz -C ${HOME}/.local - echo "Decompress DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz to ${HOME}/.local finished." + echo "Decompress DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz to ${HOME}/.local" + tar --no-same-owner -zxf /tmp/devkitdependencies/DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz -C ${HOME}/.local + echo "Decompress DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz to ${HOME}/.local finished." echo "change ${HOME}/.bashrc" - sed -i '/DevKit-CLI-24.0.RC3-Linux-Kunpeng/d' ${HOME}/.bashrc + sed -i '/DevKit-CLI-24.0.T50-Linux-Kunpeng/d' ${HOME}/.bashrc cat >> ${HOME}/.bashrc <<'EOF' -export PATH=${HOME}/.local/DevKit-CLI-24.0.RC3-Linux-Kunpeng:${PATH} +export PATH=${HOME}/.local/DevKit-CLI-24.0.T50-Linux-Kunpeng:${PATH} EOF echo "source ${HOME}/.bashrc" -- Gitee From a7fbc6ef268ad2309a1aacb272490308cf9a1d83 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:16:02 +0000 Subject: [PATCH 07/10] update component/DevKitWeb/devkit_installer/installer_command_line.py. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- component/DevKitWeb/devkit_installer/installer_command_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component/DevKitWeb/devkit_installer/installer_command_line.py b/component/DevKitWeb/devkit_installer/installer_command_line.py index 049c3db..56b82fe 100644 --- a/component/DevKitWeb/devkit_installer/installer_command_line.py +++ b/component/DevKitWeb/devkit_installer/installer_command_line.py @@ -1,6 +1,6 @@ import argparse -PACKAGE_NAME = "DevKit-All-24.0.RC3-Linux-Kunpeng.tar.gz" +PACKAGE_NAME = "DevKit-All-24.0.T50-Linux-Kunpeng.tar.gz" class CommandLine: -- Gitee From 1676cb53d137a359bb01d73302808df5978f4b12 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:16:35 +0000 Subject: [PATCH 08/10] update tools/download_and_deploy/src/component_install/devkitcli_deploy.py. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- .../src/component_install/devkitcli_deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/download_and_deploy/src/component_install/devkitcli_deploy.py b/tools/download_and_deploy/src/component_install/devkitcli_deploy.py index f1f8e2b..fe1b4f9 100644 --- a/tools/download_and_deploy/src/component_install/devkitcli_deploy.py +++ b/tools/download_and_deploy/src/component_install/devkitcli_deploy.py @@ -6,7 +6,7 @@ from component_install.deploy_base import DeployBase class DevkitCLIDeploy(DeployBase): component_name = "DevKitCLI" remote_file_list = [ - os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz"), + os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz"), os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKitCLI" + "install.sh"), os.path.join("/tmp", constant.DEPENDENCY_DIR, "DevKitCLI" + "check_install_result.sh"), ] -- Gitee From ba384e0431bf2e11548cf750c8e29ba52238b188 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:17:22 +0000 Subject: [PATCH 09/10] update tools/download_and_deploy/src/component_install/devkitweb_deploy.py. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- .../src/component_install/devkitweb_deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py index 98ae1f0..b0178d9 100644 --- a/tools/download_and_deploy/src/component_install/devkitweb_deploy.py +++ b/tools/download_and_deploy/src/component_install/devkitweb_deploy.py @@ -10,7 +10,7 @@ from utils import base_path, CHECK_OPT_SPACE_SUFFICIENT_FOR_PACKAGE, CHECK_SUDO_ class DevkitWebDeploy(DeployBase): component_name = "DevKitWeb" remote_file_list = [ - os.path.join("/opt", "DevKit-All-24.0.RC3-Linux-Kunpeng.tar.gz") + os.path.join("/opt", "DevKit-All-24.0.T50-Linux-Kunpeng.tar.gz") ] @classmethod -- Gitee From 5ab5078db65eba5418d317280d6c51ab6270c1e0 Mon Sep 17 00:00:00 2001 From: devkit-pipeline <3361635964@qq.com> Date: Wed, 5 Mar 2025 02:18:27 +0000 Subject: [PATCH 10/10] update tools/download_and_deploy/src/download/download_config.py. Signed-off-by: devkit-pipeline <3361635964@qq.com> --- .../src/download/download_config.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index 9469e82..59f77f0 100644 --- a/tools/download_and_deploy/src/download/download_config.py +++ b/tools/download_and_deploy/src/download/download_config.py @@ -21,32 +21,32 @@ BiShengJDK17 = { CompatibilityTesting = { "component_name": "CompatibilityTesting", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/compatibility_testing.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/compatibility_testing.tar.gz", "file_size": "37157928", } DevKitTester = { "component_name": "DevKitTester", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/devkit_tester.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/devkit_tester.tar.gz", "file_size": "36155839", } A_FOT = { "component_name": "A-FOT", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.4/a-fot.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.1/a-fot.tar.gz", "file_size": "15740", } DevKitWeb = { "component_name": "DevKitWeb", - "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-All-24.0.RC3-Linux-Kunpeng.tar.gz", - "file_size": "1279995524", + "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-All-24.0.T50-Linux-Kunpeng.tar.gz", + "file_size": "1363766065", } DevKitCLI = { "component_name": "DevKitCLI", - "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-CLI-24.0.RC3-Linux-Kunpeng.tar.gz", - "file_size": "649281376", + "file": "https://mirrors.huaweicloud.com/kunpeng/archive/DevKit/Packages/Kunpeng_DevKit/DevKit-CLI-24.0.T50-Linux-Kunpeng.tar.gz", + "file_size": "783553392", } -- Gitee