Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
44954ab5
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
44954ab5
编写于
12月 22, 2017
作者:
K
kennytm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clarify toolstate names. Move publish.py to a more convenient location.
上级
d7488c30
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
13 addition
and
12 deletion
+13
-12
.travis.yml
.travis.yml
+1
-1
src/bootstrap/check.rs
src/bootstrap/check.rs
+4
-4
src/bootstrap/tool.rs
src/bootstrap/tool.rs
+2
-2
src/bootstrap/toolstate.rs
src/bootstrap/toolstate.rs
+5
-4
src/ci/docker/x86_64-gnu-tools/checktools.sh
src/ci/docker/x86_64-gnu-tools/checktools.sh
+1
-1
src/tools/publish_toolstate.py
src/tools/publish_toolstate.py
+0
-0
未找到文件。
.travis.yml
浏览文件 @
44954ab5
...
...
@@ -188,7 +188,7 @@ matrix:
script
:
MESSAGE_FILE=$(mktemp -t msg.XXXXXX);
. src/ci/docker/x86_64-gnu-tools/repo.sh;
commit_toolstate_change "$MESSAGE_FILE" "$TRAVIS_BUILD_DIR/src/
ci/docker/x86_64-gnu-tools/publish
.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE"
commit_toolstate_change "$MESSAGE_FILE" "$TRAVIS_BUILD_DIR/src/
tools/publish_toolstate
.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE"
env
:
global
:
...
...
src/bootstrap/check.rs
浏览文件 @
44954ab5
...
...
@@ -256,7 +256,7 @@ fn run(self, builder: &Builder) {
builder
.add_rustc_lib_path
(
compiler
,
&
mut
cargo
);
if
try_run
(
build
,
&
mut
cargo
)
{
build
.save_toolstate
(
"rls"
,
ToolState
::
Test
ing
);
build
.save_toolstate
(
"rls"
,
ToolState
::
Test
Pass
);
}
}
}
...
...
@@ -302,7 +302,7 @@ fn run(self, builder: &Builder) {
builder
.add_rustc_lib_path
(
compiler
,
&
mut
cargo
);
if
try_run
(
build
,
&
mut
cargo
)
{
build
.save_toolstate
(
"rustfmt"
,
ToolState
::
Test
ing
);
build
.save_toolstate
(
"rustfmt"
,
ToolState
::
Test
Pass
);
}
}
}
...
...
@@ -352,7 +352,7 @@ fn run(self, builder: &Builder) {
builder
.add_rustc_lib_path
(
compiler
,
&
mut
cargo
);
if
try_run
(
build
,
&
mut
cargo
)
{
build
.save_toolstate
(
"miri"
,
ToolState
::
Test
ing
);
build
.save_toolstate
(
"miri"
,
ToolState
::
Test
Pass
);
}
}
else
{
eprintln!
(
"failed to test miri: could not build"
);
...
...
@@ -407,7 +407,7 @@ fn run(self, builder: &Builder) {
builder
.add_rustc_lib_path
(
compiler
,
&
mut
cargo
);
if
try_run
(
build
,
&
mut
cargo
)
{
build
.save_toolstate
(
"clippy-driver"
,
ToolState
::
Test
ing
);
build
.save_toolstate
(
"clippy-driver"
,
ToolState
::
Test
Pass
);
}
}
else
{
eprintln!
(
"failed to test clippy: could not build"
);
...
...
src/bootstrap/tool.rs
浏览文件 @
44954ab5
...
...
@@ -116,9 +116,9 @@ fn run(self, builder: &Builder) -> Option<PathBuf> {
let
mut
cargo
=
prepare_tool_cargo
(
builder
,
compiler
,
target
,
"build"
,
path
);
let
is_expected
=
build
.try_run
(
&
mut
cargo
);
build
.save_toolstate
(
tool
,
if
is_expected
{
ToolState
::
Compiling
ToolState
::
TestFail
}
else
{
ToolState
::
B
roken
ToolState
::
B
uildFail
});
if
!
is_expected
{
...
...
src/bootstrap/toolstate.rs
浏览文件 @
44954ab5
...
...
@@ -9,19 +9,20 @@
// except according to those terms.
#[derive(Copy,
Clone,
Debug,
Deserialize,
Serialize,
PartialEq,
Eq)]
#[serde(rename_all
=
"kebab-case"
)]
/// Whether a tool can be compiled, tested or neither
pub
enum
ToolState
{
/// The tool compiles successfully, but the test suite fails
Compiling
=
1
,
TestFail
=
1
,
/// The tool compiles successfully and its test suite passes
Test
ing
=
2
,
Test
Pass
=
2
,
/// The tool can't even be compiled
B
roken
=
0
,
B
uildFail
=
0
,
}
impl
Default
for
ToolState
{
fn
default
()
->
Self
{
// err on the safe side
ToolState
::
B
roken
ToolState
::
B
uildFail
}
}
src/ci/docker/x86_64-gnu-tools/checktools.sh
浏览文件 @
44954ab5
...
...
@@ -41,6 +41,6 @@ $COMMIT\t$(cat "$TOOLSTATE_FILE")
exit
0
fi
if
grep
-q
'Broken\|Compiling'
"
$TOOLSTATE_FILE
"
;
then
if
grep
-q
fail
"
$TOOLSTATE_FILE
"
;
then
exit
4
fi
src/
ci/docker/x86_64-gnu-tools/publish
.py
→
src/
tools/publish_toolstate
.py
浏览文件 @
44954ab5
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录