Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bug: 去除国际化描述信息中的非法占位符信息 #11182 #11205

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bug: 去除国际化描述信息中的非法占位符信息 #11182 #11205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...kend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/WorkRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ object WorkRunner {
ThirdPartyAgentBuildInfoUtils.setBuildInfo(buildInfo)

Runner.run(object : WorkspaceInterface {
val workspace = buildInfo.workspace
val workspace = buildInfo.workspace.trim()
override fun getWorkspaceAndLogDir(
variables: Map<String, String>,
pipelineId: String
Expand Down
2 changes: 1 addition & 1 deletion support-files/i18n/worker/message_en_US.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
2130068=From ({0}) to ({1}), Switch pulls code
2130069=Get Svn directory error
2130070=Parameter error
2130071=To run the agent, you need the write permission of the temporary directory of the build machine, please check the permissions of the agent running account: {0}\nYou can check the start account of the devopsAgent process and the specified build account configured by devops.slave.user in the {agent_dir}.agent.properties file (this option is not required, it is set by the user), and if there is one, it can be deleted or modified to the correct account
2130071=To run the agent, you need the write permission of the working directory of the build machine, please check the permissions of the agent running account: {0}
2130072=Unknown error:
2130073=Agent DNS Error
2130074=Agent Network Connect Failed
Expand Down
2 changes: 1 addition & 1 deletion support-files/i18n/worker/message_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
2130068=从({0})变为({1}), switch拉取代码
2130069=获取Svn目录错误
2130070=参数错误
2130071=运行Agent需要构建机临时目录的写权限，请检查Agent运行账号相关权限: {0}\n可以检查devopsAgent进程的启动账号和{agent_dir}/.agent.properties文件中的devops.slave.user配置的指定构建账号（此选项非必须，是由用户设置),如果有可删除或者修改为正确的账号
2130071=运行Agent需要构建机工作目录的写权限，请检查Agent运行账号相关权限: {0}
2130072=未知错误:
2130073=构建机DNS解析问题
2130074=构建机网络连接问题
Expand Down
Loading