Shellcheck ci scripts, add a small .editorconfig (#186)

* Shellcheck ci/script.sh

* Shellcheck ci/install.sh, simplify script a bit

* Add .editorconfig for ci/*.sh

* Shellcheck ci/before_deploy.sh
This commit is contained in:
Oleksii Filonenko
2019-08-13 21:55:31 +03:00
committed by Roey Darwish Dror
parent bfbf7039e2
commit 7cfdc69b63
4 changed files with 35 additions and 41 deletions

3
.editorconfig Normal file
View File

@@ -0,0 +1,3 @@
[ci/*.sh]
indent_style = space
indent_size = 4

View File

@@ -3,10 +3,9 @@
set -ex set -ex
main() { main() {
local src=$(pwd) \ src=$(pwd)
stage=
case $TRAVIS_OS_NAME in case "$TRAVIS_OS_NAME" in
linux) linux)
stage=$(mktemp -d) stage=$(mktemp -d)
;; ;;
@@ -18,16 +17,16 @@ main() {
test -f Cargo.lock || cargo generate-lockfile test -f Cargo.lock || cargo generate-lockfile
# TODO Update this to build the artifacts that matter to you # TODO Update this to build the artifacts that matter to you
cross rustc --bin topgrade --target $TARGET --release --all-features -- -C lto cross rustc --bin topgrade --target "$TARGET" --release --all-features -- -C lto
# TODO Update this to package the right artifacts # TODO Update this to package the right artifacts
cp target/$TARGET/release/topgrade $stage/ cp target/"$TARGET"/release/topgrade "$stage"/
cd $stage cd "$stage"
tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz * tar czf "$src"/"$CRATE_NAME"-"$TRAVIS_TAG"-"$TARGET".tar.gz ./*
cd $src cd "$src"
rm -rf $stage rm -rf "$stage"
} }
main main

View File

@@ -1,47 +1,39 @@
set -ex set -ex
main() { main() {
local target= if [ "$TRAVIS_OS_NAME" = linux ]; then
if [ $TRAVIS_OS_NAME = linux ]; then
target=x86_64-unknown-linux-musl target=x86_64-unknown-linux-musl
sort=sort sort="sort"
else else
target=x86_64-apple-darwin target=x86_64-apple-darwin
sort=gsort # for `sort --sort-version`, from brew's coreutils. sort="gsort" # for `sort --sort-version`, from brew's coreutils.
fi fi
# Builds for iOS are done on OSX, but require the specific target to be # Builds for iOS are done on OSX, but require the specific target to be
# installed. # installed.
case $TARGET in # shellcheck disable=SC2153
aarch64-apple-ios) case "$TARGET" in
rustup target install aarch64-apple-ios aarch64-apple-ios | \
;; armv7-apple-ios | \
armv7-apple-ios) armv7s-apple-ios | \
rustup target install armv7-apple-ios i386-apple-ios | \
;; x86_64-apple-ios)
armv7s-apple-ios) rustup target install "$TARGET"
rustup target install armv7s-apple-ios
;;
i386-apple-ios)
rustup target install i386-apple-ios
;;
x86_64-apple-ios)
rustup target install x86_64-apple-ios
;; ;;
esac esac
# This fetches latest stable release # This fetches latest stable release
local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross |
| cut -d/ -f3 \ cut -d/ -f3 |
| grep -E '^v[0.1.0-9.]+$' \ grep -E '^v[0.1.0-9.]+$' |
| $sort --version-sort \ $sort --version-sort |
| tail -n1) tail -n1)
curl -LSfs https://japaric.github.io/trust/install.sh | \ curl -LSfs https://japaric.github.io/trust/install.sh |
sh -s -- \ sh -s -- \
--force \ --force \
--git japaric/cross \ --git japaric/cross \
--tag $tag \ --tag "$tag" \
--target $target --target $target
} }
main main

View File

@@ -7,9 +7,9 @@ main() {
cargo fmt --all -- --check cargo fmt --all -- --check
cross clippy --all-targets -- -D warnings cross clippy --all-targets -- -D warnings
cross clippy --all-targets --all-features -- -D warnings cross clippy --all-targets --all-features -- -D warnings
cross check --target $TARGET --release --all-features cross check --target "$TARGET" --release --all-features
if [ ! -z $DISABLE_TESTS ]; then if [ -n "$DISABLE_TESTS" ]; then
return return
fi fi
@@ -17,6 +17,6 @@ main() {
} }
# we don't run the "test phase" when doing deploys # we don't run the "test phase" when doing deploys
if [ -z $TRAVIS_TAG ]; then if [ -z "$TRAVIS_TAG" ]; then
main main
fi fi