Fix travis config and CI scripts.

yoshihitoh · Jun 26, 2019 · 7fe7331 · 7fe7331
1 parent 3e2cfd0
commit 7fe7331
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: rust
 cache: cargo
 env:
   global:
-    - PROJECT_NAME: ut
+    - PROJECT_NAME: ut-cli
     - RUST_BACKTRACE: full
 addons:
   apt:
@@ -33,7 +33,7 @@ deploy:
   file: deployment/${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}.tar.gz
   on:
     condition: $TRAVIS_RUST_VERSION = stable
-    repo: yoshihitoh/ut
+    repo: yoshihitoh/${PROJECT_NAME}
     branch: master
     tags: true
   api_key:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ci/before_deploy.bash b/ci/before_deploy.bash
@@ -2,27 +2,26 @@
 
 set -exo pipefail
 
-PROJECT_NAME="ut"
-
 make_artifacts() {
     cargo build --target "$TARGET" --release
 }
 
 make_tarball() {
     local tmp_dir="$(mktemp -d)"
     local name="${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}"
-    local staging="$tmp_dir/$name"
-    mkdir -p "$staging/complete"
+    local staging="${tmp_dir}/${name}"
+    local bin_name='ut'
+    mkdir -p "${staging}/complete"
 
     local out_dir="$(pwd)/deployment"
-    mkdir -p "$out_dir"
+    mkdir -p "${out_dir}"
 
-    cp "target/$TARGET/release/$PROJECT_NAME" "$staging/$PROJECT_NAME"
-    strip "$staging/$PROJECT_NAME"
-    cp {README.md,LICENSE} "$staging"
+    cp "target/${TARGET}/release/${bin_name}" "${staging}/${bin_name}"
+    strip "${staging}/${bin_name}"
+    cp {README.md,LICENSE*} "${staging}"
 
-    (cd "$tmp_dir" && tar czf "$out_dir/$name.tar.gz" "$name")
-    rm -rf "$tmp_dir"
+    (cd "${tmp_dir}" && tar czf "${out_dir}/${name}.tar.gz" "${name}")
+    rm -rf "${tmp_dir}"
 }
 
 main() {