From e54b7f24276e219953134f3b0720102b309b3f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Mon, 28 Oct 2019 13:05:33 +1300 Subject: [PATCH] Remove appveyor --- .editorconfig | 6 +++++- .travis.yml | 10 +++++----- appveyor.yml | 44 -------------------------------------------- ci/before.sh | 6 +++--- ci/deploy.sh | 8 ++++---- ci/script.sh | 8 ++++---- 6 files changed, 21 insertions(+), 61 deletions(-) delete mode 100644 appveyor.yml diff --git a/.editorconfig b/.editorconfig index af06a30..a22fb32 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,13 +1,17 @@ root = true [*] -indent_style = tab +indent_style = space indent_size = 4 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true +[Makefile] +indent_style = tab +indent_size = 8 + [*.toml] indent_size = 2 diff --git a/.travis.yml b/.travis.yml index cb2a83d..2d59fa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: apt: packages: - fakeroot - - musl-dev + - musl-dev - musl-tools env: @@ -27,11 +27,11 @@ matrix: - env: CARGO_CLIPPY=1 - env: TARGET=i686-unknown-linux-musl - env: TARGET=x86_64-unknown-linux-musl - - env: TARGET=x86_64-pc-windows-gnu + - env: TARGET=x86_64-pc-windows-gnu include: # Default test+release versions - - os: windows - rust: stable + - os: windows + rust: stable env: TARGET=x86_64-pc-windows-msvc - os: osx rust: stable @@ -47,7 +47,7 @@ matrix: - os: linux rust: stable env: TARGET=x86_64-unknown-linux-musl - - os: windows + - os: windows rust: stable env: TARGET=x86_64-pc-windows-gnu diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index f9aad25..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,44 +0,0 @@ -environment: - global: - PROJECT_NAME: watchexec - matrix: - - TARGET: x86_64-pc-windows-gnu - CHANNEL: stable - -# Install Rust and Cargo -# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml) -install: - - curl -sSf -o rustup-init.exe https://win.rustup.rs/ - - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y - - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin - - rustc -V - - cargo -V - -# ??? -build: false - -# Equivalent to Travis' `script` phase -test_script: - - cargo test --verbose - -before_deploy: - # Generate artifacts for release - - cargo build --release --locked - - mkdir staging - - copy target\release\watchexec.exe staging - - copy LICENSE staging\LICENSE.txt - - cd staging - - 7z a ../%PROJECT_NAME%-%APPVEYOR_REPO_TAG_NAME%-%TARGET%.zip * - - appveyor PushArtifact ../%PROJECT_NAME%-%APPVEYOR_REPO_TAG_NAME%-%TARGET%.zip - -deploy: - description: 'Automatically deployed release' - artifact: /.*\.zip/ - #auth_token: - # secure: OkayPFKJ16PAH15rWQBdEQDgd3tlNP/ZcssaunpK9AHU+t9zZlO5qvUAok1JT3lR - #provider: GitHub - provider: Webhook - url: https://example.com/goes-nowhere - on: - appveyor_repo_tag: true diff --git a/ci/before.sh b/ci/before.sh index ae64159..339b17b 100755 --- a/ci/before.sh +++ b/ci/before.sh @@ -6,13 +6,13 @@ rustup target add $TARGET cargo clean --target $TARGET --verbose if [ $TRAVIS_OS_NAME = windows ]; then - choco install windows-sdk-10.1 + choco install windows-sdk-10.1 fi if [[ ! -z "$CARGO_AUDIT" ]]; then - which cargo-audit || cargo install --debug cargo-audit + which cargo-audit || cargo install --debug cargo-audit # --debug for faster build at the minimal expense of runtime speed elif [[ ! -z "$CARGO_CLIPPY" ]]; then - rustup component add clippy + rustup component add clippy fi diff --git a/ci/deploy.sh b/ci/deploy.sh index 91f1af6..e12d04b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -74,10 +74,10 @@ Description: Executes commands in response to file modifications. Software development often involves running the same commands over and over. Boring! Watchexec is a simple, standalone tool that watches a path and runs a command whenever it detects modifications. CONTROL - cd .. - fakeroot dpkg -b "$name" - mv "$name.deb" "$out_dir/" - popd + cd .. + fakeroot dpkg -b "$name" + mv "$name.deb" "$out_dir/" + popd fi ls -shal "$out_dir/" diff --git a/ci/script.sh b/ci/script.sh index 3e40488..b82b0bd 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash if [[ ! -z "$CARGO_AUDIT" ]]; then - cargo check --target $TARGET - cargo audit + cargo check --target $TARGET + cargo audit elif [[ ! -z "$CARGO_CLIPPY" ]]; then - cargo clippy --target $TARGET + cargo clippy --target $TARGET else - cargo test --target $TARGET + cargo test --target $TARGET fi