aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-04-26 15:17:05 +0100
committerGitHub <[email protected]>2021-04-26 15:17:05 +0100
commit6cd669e8809d9e19b2169d04b99f33258848b814 (patch)
tree485371c10449f0da91f2170a9ae904cca678f60d
parenteee50b6921662dee766c987e1a0b15b371e141d1 (diff)
parentc24bdab97e53943fd36cf4e63047785b9c08077b (diff)
Merge #8668
8668: Use more cross-platform utc `date` argument r=matklad a=SomeoneToIgnore Part of https://github.com/rust-analyzer/rust-analyzer/issues/8571 ``` $ docker run -it --rm ubuntu:20.04 bash root@7393d1e7bbad:/# date -u +%Y-%m-%d 2021-04-26 ``` ``` $ date -u +%Y-%m-%d 2021-04-26 $ uname -a Darwin alaptop.local 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21 00:07:06 PST 2021; root:xnu-7195.81.3~1/RELEASE_X86_64 x86_64 ``` Some of the places where I've change this do not really require it (since macos bin would have failed with `--iso` param also), but I've changed them for consistency. Co-authored-by: Kirill Bulatov <[email protected]>
-rw-r--r--.github/workflows/release.yaml2
-rw-r--r--crates/rust-analyzer/build.rs2
-rw-r--r--xtask/src/main.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b50ca9a6f..d5c93f69b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -261,7 +261,7 @@ jobs:
261 with: 261 with:
262 node-version: 12.x 262 node-version: 12.x
263 263
264 - run: echo "TAG=$(date --iso --utc)" >> $GITHUB_ENV 264 - run: echo "TAG=$(date --iso -u)" >> $GITHUB_ENV
265 if: github.ref == 'refs/heads/release' 265 if: github.ref == 'refs/heads/release'
266 - run: echo "TAG=nightly" >> $GITHUB_ENV 266 - run: echo "TAG=nightly" >> $GITHUB_ENV
267 if: github.ref != 'refs/heads/release' 267 if: github.ref != 'refs/heads/release'
diff --git a/crates/rust-analyzer/build.rs b/crates/rust-analyzer/build.rs
index 780d247c9..bca6611d6 100644
--- a/crates/rust-analyzer/build.rs
+++ b/crates/rust-analyzer/build.rs
@@ -55,7 +55,7 @@ fn commit_hash() -> Option<String> {
55} 55}
56 56
57fn build_date() -> Option<String> { 57fn build_date() -> Option<String> {
58 output_to_string("date --utc +%Y-%m-%d") 58 output_to_string("date -u +%Y-%m-%d")
59} 59}
60 60
61fn output_to_string(command: &str) -> Option<String> { 61fn output_to_string(command: &str) -> Option<String> {
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 01bf6e70d..ce3353410 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -108,7 +108,7 @@ fn run_fuzzer() -> Result<()> {
108} 108}
109 109
110fn date_iso() -> Result<String> { 110fn date_iso() -> Result<String> {
111 let res = cmd!("date --utc +%Y-%m-%d").read()?; 111 let res = cmd!("date -u +%Y-%m-%d").read()?;
112 Ok(res) 112 Ok(res)
113} 113}
114 114