From 3842d8c22401331c551328d128dfee05c0c742f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Tue, 21 Aug 2018 15:12:00 +1200 Subject: [PATCH] Adjust CI --- .travis.yml | 31 +++++++++++++++++++++++++------ Cargo.toml | 10 +++++++--- README.md | 10 +++++----- appveyor.yml | 14 +++++++------- 4 files changed, 44 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0ca463..3c6214a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: rust cache: cargo +dist: trusty +sudo: false env: global: @@ -7,6 +9,7 @@ env: matrix: include: + # Default test+release version - os: linux rust: stable env: TARGET=x86_64-unknown-linux-gnu @@ -14,6 +17,25 @@ matrix: rust: stable env: TARGET=x86_64-apple-darwin + # Minimum version advertised in readme + - os: linux + rust: 1.16.0 + env: TARGET=x86_64-unknown-linux-gnu + - os: osx + rust: 1.16.0 + env: TARGET=x86_64-apple-darwin + + # Non-critical but interesting for upcoming Rust changes + - os: linux + rust: nightly + env: TARGET=x86_64-unknown-linux-gnu + - os: osx + rust: nightly + env: TARGET=x86_64-apple-darwin + + allow_failures: + - rust: nightly + script: - bash ci/script.sh @@ -23,17 +45,14 @@ before_deploy: deploy: provider: releases api_key: - secure: UsikH6ulNyA6vHcbNP16evFpHW9A/ns8+sP2eXWRgW9lmp2Fjwi+xiZaQdqvcUU/yxhjysnCVAvMKzIHKaWofxNLn/8H7s1+f0KeEYW3bJLKyc06vtNX41PTqFZ7/jFEYOroyKrLVzWz4oqRUs+nHZcFUM/stUfyRJe4RCX8MZ1rQ7d7LWl1DazaxXIwJ/0h1q2ywxW9UMeP1xLaUL0Wk2pKuvQ0YXG3ahxZ4mcfBmj4fQaW6ByifioATbCinoQRqGyR+tKKTWQtk/7qcyluMsIWtHOiVf3q8VW6DcV4xqNJig0jdPQvP2iciK0ajl6yvVc8rZkgTtbg8EKMFcx4QI15W5fi9lHt10FN1dkj0NYgZE78zz/7He0P8arsOj88zIGGT2t2CQyIWCkHLQscCDgJl7aTYD0BX5BiU6VfDxIx0KnLKe/+YIZETIZTF8GhnUIIdY04I+gao8MrzhkbFBJvUQje9nzHu2NOUAongj0u9ZEvJyX3vVV52/yv9IJAXqxqSoW4Uj1eJ3vOlLLM6WDPrGDwQjpdhQUt3PShElge3kOEhL1sFOAt58i8rCqKgnBFBlrYpZxD1vXrHaWSExAULI17c5h7Zysg7F42BShR0cJn326pM6slxWsp/d8PB7/neQ85jlRy6WCf/yxY38arJ7UpQIvnxrZuHzzH4vI= + secure: sbV2K4G2SA78U6d8SNZKExenWnuv1MsJ/9ovDDH4ucnzkpJEWDV2iwPklcu5oaRj3Sz4jYuYXToqcbJmSjL5eXjlk8rh2sG2LWT+8Up3X1vxte2XFXko15I/613rD8E/qWfS9FqzmuhMX+gb4P7OwWvVUwtw0IIuSGfBW/TEgUTFUZnUmgdm5ra8VnV3CvmTbn8botxbkdAUvk4C0g7yqHjlV7v9xU+DEXz2Y820cAH8ulu1ZU3JBm+XfVzZ09kByeQ7wnvyRuE4RhVtKK8nKUy+2JF7HX5N+0Du8z9ZHosV6+uoUz9i2OecYzAvL8xKiSkeHBqTxIDTeM4lnnDmnm5LsJ4aEU6pBSuWhglmflTbtAN7rBfYgZGJ6je6Gem5bOcCDtGI7+2qjf00Jo7vbmyK6D6Y6yxwf3W0QnOZcXrn9BWZLMMgochIBlVTTM1zFodcprpdHo8iHNVms3A++WqLnp1O0L/55id59VITGJNafy2vmXU/nlQi2MO03s3SF3jdHT7rchYjJRAcGR79QtCLiL3CbYnaQJsDNviyMm1VC6hkst0tXB8t12v2ht5NU7NEN8E31jnnRLRnwr7LUFRgOzFVF0M5jSqs3eCLnYyI7gCMKL2qOZ2yxJuD9bKsVZDpVvUqnaj5ifE+TMYoONPrc9W1hTyfcND9MhCsM+g= file_glob: true file: ${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}.* skip_cleanup: true on: + repo: watchexec/watchexec tags: true - -branches: - only: - - master - - "/^\\d+\\.\\d+\\.\\d+.*$/" + rust: stable notifications: email: diff --git a/Cargo.toml b/Cargo.toml index 87a00a1..2d6da57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,14 +3,18 @@ name = "watchexec" version = "1.9.0" authors = ["Matt Green "] description = "Executes commands in response to file modifications" -documentation = "https://github.com/mattgreen/watchexec" -homepage = "https://github.com/mattgreen/watchexec" -repository = "https://github.com/mattgreen/watchexec" +documentation = "https://github.com/watchexec/watchexec" +homepage = "https://github.com/watchexec/watchexec" +repository = "https://github.com/watchexec/watchexec" readme = "README.md" keywords = ["watcher", "inotify", "fsevents", "kqueue"] categories = ["command-line-utilities"] license = "Apache-2.0" +[badges] +appveyor = { repository = "watchexec/watchexec" } +travis-ci = { repository = "watchexec/watchexec" } + [profile.dev] panic = "abort" diff --git a/README.md b/README.md index 8e8b969..eac4798 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # watchexec -[![Build Status](https://travis-ci.org/mattgreen/watchexec.svg?branch=master)](https://travis-ci.org/mattgreen/watchexec) -[![Build status](https://ci.appveyor.com/api/projects/status/ivxu31g4rcf4740t?svg=true)](https://ci.appveyor.com/project/mattgreen/watchexec) -[![Crates.io status](https://img.shields.io/crates/v/watchexec.svg)](https://crates.io/crates/watchexec) +[![Build Status](https://badgen.net/travis/watchexec/watchexec/master)](https://travis-ci.org/watchexec/watchexec) +[![Build status](https://badgen.net/appveyor/ci/watchexec/watchexec/master)](https://ci.appveyor.com/project/watchexec/watchexec) +[![Crates.io status](https://badgen.net/crates/v/watchexec)](https://crates.io/crates/watchexec) Software development often involves running the same commands over and over. Boring! @@ -18,7 +18,7 @@ Example use cases: * Simple invocation and use * Runs on OS X, Linux and Windows * Monitors current directory and all subdirectories for changes - * Uses most efficient event polling mechanism for your platform (except for [BSD](https://github.com/passcod/rsnotify#todo)) + * Uses most efficient event polling mechanism for your platform (except for [BSD](https://github.com/passcod/notify#todo)) * Coalesces multiple filesystem events into one, for editors that use swap/backup files during saving * By default, uses `.gitignore` to determine which files to ignore notifications for * Support for watching files with a specific extension @@ -102,5 +102,5 @@ Rust 1.16 or later is required. ## Credits -* [notify](https://github.com/passcod/rsnotify) for doing most of the heavy-lifting +* [notify](https://github.com/passcod/notify) for doing most of the heavy-lifting * [globset](https://crates.io/crates/globset) for super-fast glob matching diff --git a/appveyor.yml b/appveyor.yml index 07245b6..ba7813d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,6 +27,7 @@ before_deploy: - cargo build --release - 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 @@ -34,12 +35,11 @@ before_deploy: deploy: description: 'Automatically deployed release' artifact: /.*\.zip/ - auth_token: - secure: h1ufwX1COhKiHGgBY22L37kd1kPCTEpkiGlw4mx/7Ib5nS3SlxRvkuKwteh5sJkh - provider: GitHub + #auth_token: + # secure: OkayPFKJ16PAH15rWQBdEQDgd3tlNP/ZcssaunpK9AHU+t9zZlO5qvUAok1JT3lR + #provider: GitHub + provider: Webhook + url: https://example.com/goes-nowhere on: + branch: master appveyor_repo_tag: true - -branches: - only: - - master