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

Remove build date from version #3820

Merged
merged 2 commits into from
Mar 12, 2017
Merged

Remove build date from version #3820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e6c83f
Remove build date from version
alexcrichton Mar 12, 2017
401153c
Tweak travis targets and dates
alexcrichton Mar 12, 2017
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
16 changes: 8 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,36 +61,36 @@ matrix:
IMAGE=cross
- env: TARGET=mips64-unknown-linux-gnuabi64
IMAGE=cross
rust: beta
rust: beta-2017-03-03
- env: TARGET=mips64el-unknown-linux-gnuabi64
IMAGE=cross
rust: beta
rust: beta-2017-03-03
- env: TARGET=s390x-unknown-linux-gnu
IMAGE=cross
rust: beta
rust: beta-2017-03-03
- env: TARGET=powerpc-unknown-linux-gnu
IMAGE=cross
rust: beta
rust: beta-2017-03-03
- env: TARGET=powerpc64-unknown-linux-gnu
IMAGE=cross
rust: beta
rust: beta-2017-03-03
- env: TARGET=powerpc64le-unknown-linux-gnu
IMAGE=cross
rust: beta
rust: beta-2017-03-03

# beta/nightly builds
- env: TARGET=x86_64-unknown-linux-gnu
ALT=i686-unknown-linux-gnu
IMAGE=dist
MAKE_TARGETS="test distcheck doc install uninstall"
DEPLOY=0
rust: beta
rust: beta-2017-03-03
- env: TARGET=x86_64-unknown-linux-gnu
ALT=i686-unknown-linux-gnu
IMAGE=dist
MAKE_TARGETS="test distcheck doc install uninstall"
DEPLOY=0
rust: nightly
rust: nightly-2017-03-03

exclude:
- rust: stable
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ install:

# FIXME(#3394) use master rustup
- curl -sSfO https://static.rust-lang.org/rustup/archive/0.6.5/x86_64-pc-windows-msvc/rustup-init.exe
- rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly
- rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly-2017-03-03
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
- if defined OTHER_TARGET rustup target add %OTHER_TARGET%
Expand Down
15 changes: 3 additions & 12 deletions src/cargo/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ pub struct CommitInfo {
pub struct CfgInfo {
// Information about the git repository we may have been built from.
pub commit_info: Option<CommitInfo>,
// The date that the build was performed.
pub build_date: String,
// The release channel we were built for.
pub release_channel: String,
}
Expand Down Expand Up @@ -93,15 +91,9 @@ impl fmt::Display for VersionInfo {
};

if let Some(ref cfg) = self.cfg_info {
match cfg.commit_info {
Some(ref ci) => {
write!(f, " ({} {})",
ci.short_commit_hash, ci.commit_date)?;
},
None => {
write!(f, " (built {})",
cfg.build_date)?;
}
if let Some(ref ci) = cfg.commit_info {
write!(f, " ({} {})",
ci.short_commit_hash, ci.commit_date)?;
}
};
Ok(())
Expand Down Expand Up @@ -260,7 +252,6 @@ pub fn version() -> VersionInfo {
patch: env_str!("CARGO_PKG_VERSION_PATCH"),
pre_release: option_env_str!("CARGO_PKG_VERSION_PRE"),
cfg_info: Some(CfgInfo {
build_date: option_env_str!("CFG_BUILD_DATE").unwrap(),
release_channel: option_env_str!("CFG_RELEASE_CHANNEL").unwrap(),
commit_info: commit_info,
}),
Expand Down