1
1
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 05:12:40 +03:00

ci: use consistent git core.abbrev setting for TAGNAME

refs: https://github.com/wez/wezterm/issues/1365
This commit is contained in:
Wez Furlong 2021-12-05 19:21:06 -07:00
parent ce06d59a94
commit bde2c728bf
6 changed files with 8 additions and 4 deletions

View File

@ -13,7 +13,7 @@ install -Dm644 assets/wezterm.appdata.xml AppDir/usr/share/metainfo/org.wezfurlo
[ -x /tmp/linuxdeploy ] || ( curl -L 'https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage' -o /tmp/linuxdeploy && chmod +x /tmp/linuxdeploy ) [ -x /tmp/linuxdeploy ] || ( curl -L 'https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage' -o /tmp/linuxdeploy && chmod +x /tmp/linuxdeploy )
TAG_NAME=${TAG_NAME:-$(git show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S")} TAG_NAME=${TAG_NAME:-$(git -c "core.abbrev=8" show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S")}
distro=$(lsb_release -is) distro=$(lsb_release -is)
distver=$(lsb_release -rs) distver=$(lsb_release -rs)

View File

@ -4,7 +4,7 @@ set -e
TARGET_DIR=${1:-target} TARGET_DIR=${1:-target}
TAG_NAME=${TAG_NAME:-$(git show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S")} TAG_NAME=${TAG_NAME:-$(git -c "core.abbrev=8" show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S")}
HERE=$(pwd) HERE=$(pwd)

View File

@ -3,7 +3,7 @@
set -x set -x
TAG_NAME=${TAG_NAME:-$(git show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S")} TAG_NAME=${TAG_NAME:-$(git -c "core.abbrev=8" show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S")}
if [[ "$BUILD_REASON" == "Schedule" ]] ; then if [[ "$BUILD_REASON" == "Schedule" ]] ; then
TAR_NAME=wezterm-nightly-src.tar TAR_NAME=wezterm-nightly-src.tar

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
TAGNAME=$(git show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S") TAGNAME=$(git -c "core.abbrev=8" show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S")
git tag $TAGNAME git tag $TAGNAME

View File

@ -62,6 +62,8 @@ fn main() {
println!("cargo:rerun-if-changed={}", head.display()); println!("cargo:rerun-if-changed={}", head.display());
if let Ok(output) = std::process::Command::new("git") if let Ok(output) = std::process::Command::new("git")
.args(&[ .args(&[
"-c",
"core.abbrev=8",
"show", "show",
"-s", "-s",
"--format=%cd-%h", "--format=%cd-%h",

View File

@ -74,6 +74,8 @@ fn main() {
let version = if ci_tag.is_empty() { let version = if ci_tag.is_empty() {
let mut cmd = std::process::Command::new("git"); let mut cmd = std::process::Command::new("git");
cmd.args(&[ cmd.args(&[
"-c",
"core.abbrev=8",
"show", "show",
"-s", "-s",
"--format=%cd-%h", "--format=%cd-%h",