diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 954133709eab998d1c83563e989cb806f44f6112..f450c5f717971a0ca4a28c95ab10dba7e40d8860 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 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 5a5ce11fde3da101dd6bc1b86223b80dc357bffd..e680be6dfc41b893f9ffe5cc0e09701173d45aed 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| **部署** diff --git a/README.md b/README.md index 98257708bb67685cbd244560d7eb3ca4371a7d6e..98ef821178030006ad4297b0a225b83f4fb49561 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配置文件，以下是具体配置项说明 diff --git a/build.sh b/build.sh index 1fc8e07136de89b5aecd2a937b8c6f4973a479f6..e09b24de5a57071dc44f0213ae266c8a53aca4a2 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 diff --git a/component/DevKitCLI/check_install_result.sh b/component/DevKitCLI/check_install_result.sh index 1891d2828cf247dde70968e0d4fd60e81c9f0fdb..db3af573c2408df9924e8f59a7b6be2756f47db2 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" diff --git a/component/DevKitCLI/install.sh b/component/DevKitCLI/install.sh index 390fc6fce5a097aaf1fa6ea47598f3aab485c2ac..7ebad08b6f5a0ce6b7904087c31def93ed0f7d4b 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" diff --git a/component/DevKitWeb/devkit_installer/installer_command_line.py b/component/DevKitWeb/devkit_installer/installer_command_line.py index 049c3db7ed93c2bcae57d335b547b78d8a134c38..56b82fef03e2b51f5d243cb08ebcf87ca6203a50 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: 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 f1f8e2bd253e8729cc2182d0706220031f20efd1..fe1b4f9b11e135132deae2ff4513a804effe6c1b 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"), ] 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 98ae1f0f7947d0f08ffd6b87b1dbd484a9b8d617..b0178d9bc22eb48882b799ef58b05f7bf5edb444 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 diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index 9469e82496e5e468545f81fce2ec3a8f154cd8c8..59f77f0f63f643e4ebbbbf10220bc1c469e93276 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", }