Merge pull request #1133 from cyw3/pages-test

Adjust the pages deployment process and png storage location
Tencent · Jul 18, 2024 · f5f69a8 · f5f69a8
2 parents 9bf2b70 + 01fd2bd
commit f5f69a8
Show file tree

Hide file tree

Showing 106 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -24,6 +24,13 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
+      # 下载二进制文件
+      - name: Download Binary Files
+        run: |
+          set -ex
+          pwd
+          bash ./scripts/base/install_bin.sh
+
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:

diff --git a/doc/images/API的个人令牌.png b/doc/images/API的个人令牌.png
diff --git a/doc/images/AddRule.png b/doc/images/AddRule.png
diff --git a/doc/images/AddRule2.png b/doc/images/AddRule2.png
diff --git a/doc/images/AddRule3.png b/doc/images/AddRule3.png
diff --git a/doc/images/Fork.png b/doc/images/Fork.png
diff --git a/doc/images/NewPullRequest.png b/doc/images/NewPullRequest.png
diff --git a/doc/images/Nodemanagement.png b/doc/images/Nodemanagement.png
diff --git a/doc/images/PR.png b/doc/images/PR.png
diff --git a/doc/images/ProcessConfiguration2.png b/doc/images/ProcessConfiguration2.png
diff --git a/doc/images/Welcome.png b/doc/images/Welcome.png
diff --git a/doc/images/addcustomrules.png b/doc/images/addcustomrules.png
diff --git a/doc/images/clientConfigIni.png b/doc/images/clientConfigIni.png
diff --git a/doc/images/codelint_01.png b/doc/images/codelint_01.png
diff --git a/doc/images/codelint_02.png b/doc/images/codelint_02.png
diff --git a/doc/images/codelint_03.png b/doc/images/codelint_03.png
diff --git a/doc/images/codelint_04.png b/doc/images/codelint_04.png
diff --git a/doc/images/creataAnalysePlan.png b/doc/images/creataAnalysePlan.png
diff --git a/doc/images/createProject.png b/doc/images/createProject.png
diff --git a/doc/images/createTeam.png b/doc/images/createTeam.png
diff --git a/doc/images/create_repo.png b/doc/images/create_repo.png
diff --git a/doc/images/create_team.png b/doc/images/create_team.png
diff --git a/doc/images/create_team_group.png b/doc/images/create_team_group.png
diff --git a/doc/images/createcustomrule.png b/doc/images/createcustomrule.png
diff --git a/doc/images/customtool_01.png b/doc/images/customtool_01.png
diff --git a/doc/images/customtool_02.png b/doc/images/customtool_02.png
diff --git a/doc/images/customtool_03.png b/doc/images/customtool_03.png
diff --git a/doc/images/customtool_04.png b/doc/images/customtool_04.png
diff --git a/doc/images/customtool_05.png b/doc/images/customtool_05.png
diff --git a/doc/images/customtool_06.png b/doc/images/customtool_06.png
diff --git a/doc/images/fork1.png b/doc/images/fork1.png
diff --git a/doc/images/gitlab_application_01.png b/doc/images/gitlab_application_01.png
diff --git a/doc/images/gitlab_application_02.png b/doc/images/gitlab_application_02.png
diff --git a/doc/images/gitlab_application_03.png b/doc/images/gitlab_application_03.png
diff --git a/doc/images/gitlab_application_04.png b/doc/images/gitlab_application_04.png
diff --git a/doc/images/gitlab_oauth_QA_01.png b/doc/images/gitlab_oauth_QA_01.png
diff --git a/doc/images/gitlab_oauth_QA_02.png b/doc/images/gitlab_oauth_QA_02.png
diff --git a/doc/images/gitlab_oauth_QA_03.png b/doc/images/gitlab_oauth_QA_03.png
diff --git a/doc/images/gitlab_oauth_QA_04.png b/doc/images/gitlab_oauth_QA_04.png
diff --git a/doc/images/gitlab_oauth_QA_05.png b/doc/images/gitlab_oauth_QA_05.png
diff --git a/doc/images/gitlab_oauth_QA_06.png b/doc/images/gitlab_oauth_QA_06.png
diff --git a/doc/images/gitlab_oauth_QA_07.png b/doc/images/gitlab_oauth_QA_07.png
diff --git a/doc/images/gitlab_oauth_disposition_01.png b/doc/images/gitlab_oauth_disposition_01.png
diff --git a/doc/images/gitlab_oauth_disposition_02.png b/doc/images/gitlab_oauth_disposition_02.png
diff --git a/doc/images/gitlab_oauth_disposition_03.png b/doc/images/gitlab_oauth_disposition_03.png
diff --git a/doc/images/gitlab_oauth_disposition_04.png b/doc/images/gitlab_oauth_disposition_04.png
diff --git a/doc/images/gitlab_oauth_disposition_05.png b/doc/images/gitlab_oauth_disposition_05.png
diff --git a/doc/images/gitlab_oauth_disposition_06.png b/doc/images/gitlab_oauth_disposition_06.png
diff --git a/doc/images/gitlab_oauth_disposition_07.png b/doc/images/gitlab_oauth_disposition_07.png
diff --git a/doc/images/golangcilint.jpg b/doc/images/golangcilint.jpg
diff --git a/doc/images/golangcilintversion.jpg b/doc/images/golangcilintversion.jpg
diff --git a/doc/images/homepage.png b/doc/images/homepage.png
diff --git a/doc/images/jenkins_build.png b/doc/images/jenkins_build.png
diff --git a/doc/images/jenkins_console_output.png b/doc/images/jenkins_console_output.png
diff --git a/doc/images/jenkins_deploy_plugin.png b/doc/images/jenkins_deploy_plugin.png
diff --git a/doc/images/jenkins_environment_vars.png b/doc/images/jenkins_environment_vars.png
diff --git a/doc/images/jenkins_git_config.png b/doc/images/jenkins_git_config.png
diff --git a/doc/images/jenkins_installed_plugins.png b/doc/images/jenkins_installed_plugins.png
diff --git a/doc/images/jenkins_manage_jenkins.png b/doc/images/jenkins_manage_jenkins.png
diff --git a/doc/images/jenkins_manage_plugins.png b/doc/images/jenkins_manage_plugins.png
diff --git a/doc/images/jenkins_new_item.png b/doc/images/jenkins_new_item.png
diff --git a/doc/images/jenkins_output_url.png b/doc/images/jenkins_output_url.png
diff --git a/doc/images/jenkins_shell.png b/doc/images/jenkins_shell.png
diff --git a/doc/images/jenkins_tca_plugin_config.png b/doc/images/jenkins_tca_plugin_config.png
diff --git a/doc/images/jenkins_var_path.png b/doc/images/jenkins_var_path.png
diff --git a/doc/images/logo.png b/doc/images/logo.png
diff --git a/doc/images/manage_job_01.png b/doc/images/manage_job_01.png
diff --git a/doc/images/manage_node_01.png b/doc/images/manage_node_01.png
diff --git a/doc/images/manage_node_02.png b/doc/images/manage_node_02.png
diff --git a/doc/images/manage_node_03.png b/doc/images/manage_node_03.png
diff --git a/doc/images/manage_node_04.png b/doc/images/manage_node_04.png
diff --git a/doc/images/manage_oauth_01.png b/doc/images/manage_oauth_01.png
diff --git a/doc/images/manage_oauth_02.png b/doc/images/manage_oauth_02.png
diff --git a/doc/images/manage_org_01.png b/doc/images/manage_org_01.png
diff --git a/doc/images/manage_org_02.png b/doc/images/manage_org_02.png
diff --git a/doc/images/manage_team_01.png b/doc/images/manage_team_01.png
diff --git a/doc/images/manage_tool_01.png b/doc/images/manage_tool_01.png
diff --git a/doc/images/manage_user_01.png b/doc/images/manage_user_01.png
diff --git a/doc/images/manage_user_02.png b/doc/images/manage_user_02.png
diff --git a/doc/images/node_mange.png b/doc/images/node_mange.png
diff --git a/doc/images/org_node_manager_1.png b/doc/images/org_node_manager_1.png
diff --git a/doc/images/org_node_manager_2.png b/doc/images/org_node_manager_2.png
diff --git a/doc/images/org_node_process.png b/doc/images/org_node_process.png
diff --git a/doc/images/org_tag_manager.png b/doc/images/org_tag_manager.png
diff --git a/doc/images/org_tag_node.png b/doc/images/org_tag_node.png
diff --git a/doc/images/org_tag_scheme.png b/doc/images/org_tag_scheme.png
diff --git a/doc/images/orgsid.png b/doc/images/orgsid.png
diff --git a/doc/images/personalToken.png b/doc/images/personalToken.png
diff --git a/doc/images/planPage.png b/doc/images/planPage.png
diff --git a/doc/images/registerCodeRepo.png b/doc/images/registerCodeRepo.png
diff --git a/doc/images/scheme_codelint_01.png b/doc/images/scheme_codelint_01.png
diff --git a/doc/images/scheme_codelint_02.png b/doc/images/scheme_codelint_02.png
diff --git a/doc/images/scheme_codelint_03.png b/doc/images/scheme_codelint_03.png
diff --git a/doc/images/scheme_codelint_04.png b/doc/images/scheme_codelint_04.png
diff --git a/doc/images/scheme_template_01.png b/doc/images/scheme_template_01.png
diff --git a/doc/images/scheme_template_02.png b/doc/images/scheme_template_02.png
diff --git a/doc/images/start_scan_01.png b/doc/images/start_scan_01.png
diff --git a/doc/images/start_scan_02.png b/doc/images/start_scan_02.png
diff --git a/doc/images/start_scan_03.png b/doc/images/start_scan_03.png
diff --git a/doc/images/start_scan_04.png b/doc/images/start_scan_04.png
diff --git a/doc/images/start_scan_05.png b/doc/images/start_scan_05.png
diff --git a/doc/images/start_scan_06.png b/doc/images/start_scan_06.png
diff --git a/doc/images/team.png b/doc/images/team.png
diff --git a/doc/images/team_member.png b/doc/images/team_member.png
diff --git a/doc/images/user_token.png b/doc/images/user_token.png
diff --git a/scripts/base/install_bin.sh b/scripts/base/install_bin.sh
@@ -8,8 +8,8 @@ source $TCA_SCRIPT_ROOT/utils.sh
 
 # 代码库根目录
 TCA_ROOT=$( cd "$(dirname $TCA_SCRIPT_ROOT)"; pwd )
-LIB_GITHUB_URL=${LIB_GITHUB_URL:-"https://github.com/TCATools/tca_lib/releases/download/v20240716.1/tca_lib-v1.4.zip"}
-LIB_GONGFENG_URL=${LIB_GONGFENG_URL:-"https://git.code.tencent.com/TCA/tca-tools/tca_lib.git"}
+LIB_GITHUB_URL=${LIB_GITHUB_URL:-"https://github.com/TCATools/tca_lib/releases/download/v20240716.3/tca_lib-v1.5.zip"}
+LIB_GONGFENG_URL=${LIB_GONGFENG_URL:-"https://git.code.tencent.com/TCA/tca-tools/tca_lib.git#v20240716.3"}
 LIB_DIR_NAME="tca_lib"
 
 
@@ -38,7 +38,8 @@ function downloader() {
         # 使用工蜂默认密码
         user=$2
         password=$3
-        git clone ${url:0:8}${user}:${password}@${url:8}
+        # ${url: -11} 中间要有空格，才能是截取后几位
+        git clone -b ${url: -11} ${url:0:8}${user}:${password}@${url:8:-12}
         cmd_ret=$?
         if [[ ${cmd_ret} == 0 ]] ; then
             rm -rf "${TCA_ROOT}/${LIB_DIR_NAME}/.git"
@@ -79,11 +80,21 @@ function deepmove() {
     # 遍历
     for target in $(find $src_dir -type f); do
         relpath=$(realpath "$target" --relative-to=$src_dir)
-        # 先判断md5值，有变化才复制覆盖
-        isSame $target $dst_dir/$relpath
-        ret=$?
+        if [ ! -e "$dst_dir/$relpath" ]; then
+            # 目标位置不存在
+            ret=1
+        else
+            # 先判断md5值，有变化才复制覆盖
+            isSame $target $dst_dir/$relpath
+            ret=$?
+        fi
         if [[ $ret == 1 ]]; then
             LOG_INFO "update lib: $relpath"
+            # 判断目标位置的目录是否存在
+            parent_dir=$(dirname "$dst_dir/$relpath")
+            if [ ! -d "$parent_dir" ]; then
+                mkdir -p "${parent_dir}"
+            fi
             cp $target $dst_dir/$relpath
         fi
     done