Skip to content
This repository has been archived by the owner on Mar 10, 2020. It is now read-only.

chore/ci: initial setup #20

Merged
merged 2 commits into from
Jun 28, 2018
Merged

chore/ci: initial setup #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d6238
chore/ci: initial setup
S-Coyle Jun 13, 2018
b72d08f
Merge branch 'master' into master
S-Coyle Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 38 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
target
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls use safe_client_libs's .gitignore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now updated 👍

Cargo.lock
.direnv.*
# Executables
*.exe
*.out

# Libraires and Objects
*.o
*.a
*.so
*.lo
*.lib
*.dll
*.rlib
*.dylib

# Generated by Cargo
bin/
tags*
build/
target*/
build-tests/

# Generated by Editors
*~
~*
*.swp
*.sublime-*
*.bk

# Manual
.cargo/

# Misc
packages/
.DS_Store
*.bootstrap.cache
cargo-all.sh
bindings
tmp
12 changes: 6 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ os:
- osx
language: rust
rust:
- 1.26.1
- nightly-2018-05-29
- 1.26.2
- nightly-2018-06-10
sudo: false
cache:
cargo: true
before_script:
- curl -sSL https://github.com/maidsafe/QA/raw/master/travis/cargo_install.sh > cargo_install.sh
- bash cargo_install.sh cargo-prune;
if [ "${TRAVIS_RUST_VERSION}" = nightly-2018-05-29 ] && [ "${TRAVIS_OS_NAME}" = linux ]; then
rustup component add rustfmt-preview --toolchain nightly-2018-05-29 &&
bash cargo_install.sh clippy 0.0.206;
if [ "${TRAVIS_RUST_VERSION}" = nightly-2018-06-10 ] && [ "${TRAVIS_OS_NAME}" = linux ]; then
rustup component add rustfmt-preview --toolchain nightly-2018-06-10 &&
bash cargo_install.sh clippy 0.0.207;
fi
script:
- if [ "${TRAVIS_RUST_VERSION}" = 1.26.1 ]; then
- if [ "${TRAVIS_RUST_VERSION}" = 1.26.2 ]; then
(
set -x;
cargo test --no-default-features --release --verbose
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# tokio_utp - Change Log
## [0.1.0]
- Initial implementation
9 changes: 3 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
[package]
authors = [
"Carl Lerche <me@carllerche.com>",
"Andrew Cann <shum@canndrew.org>",
]
authors = ["MaidSafe Developers <dev@maidsafe.net>"]
description = "tokio-based uTP implementation"
documentation = "https://docs.rs/tokio-utp"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this documentation = link may break once this crate renaming goes through.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed name = back to tokio-utp so that should resolve this issue (no crate renaming will occur)

license = "MIT/Apache-2.0"
license = "MIT OR BSD-3-Clause"
name = "tokio-utp"
repository = "https://github.com/canndrew/tokio-utp"
repository = "https://github.com/maidsafe/tokio_utp"
version = "0.3.0"

[dependencies]
Expand Down
11 changes: 11 additions & 0 deletions LICENSE-BSD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Copyright 2018 MaidSafe.net limited.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7 changes: 7 additions & 0 deletions LICENSE-MIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright 2018 MaidSafe.net limited.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ An implementation of [UTP] for Rust using non-blocking sockets.

|Crate|Documentation|Linux/OS X|Windows|Issues|
|:---:|:-----------:|:--------:|:-----:|:----:|
|[![](http://meritbadge.herokuapp.com/tokio-utp)](https://crates.io/crates/tokio-utp)|[![Documentation](https://docs.rs/tokio-utp/badge.svg)](https://docs.rs/tokio-utp)|[![Build Status](https://travis-ci.org/maidsafe/tokio-utp.svg?branch=master)](https://travis-ci.org/maidsafe/tokio-utp)|[![Build status](https://ci.appveyor.com/api/projects/status/wk7vqat3xhly1ny1/branch/master?svg=true)](https://ci.appveyor.com/project/MaidSafe-QA/tokio-utp/branch/master)|[![Stories in Ready](https://badge.waffle.io/maidsafe/tokio-utp.png?label=ready&title=Ready)](https://waffle.io/maidsafe/tokio-utp)|
|[![](http://meritbadge.herokuapp.com/tokio-utp)](https://crates.io/crates/tokio-utp)|[![Documentation](https://docs.rs/tokio-utp/badge.svg)](https://docs.rs/tokio-utp)|[![Build Status](https://travis-ci.org/maidsafe/tokio_utp.svg?branch=master)](https://travis-ci.org/maidsafe/tokio_utp)|[![Build status](https://ci.appveyor.com/api/projects/status/wk7vqat3xhly1ny1/branch/master?svg=true)](https://ci.appveyor.com/project/MaidSafe-QA/tokio-utp/branch/master)|[![Stories in Ready](https://badge.waffle.io/maidsafe/tokio_utp.png?label=ready&title=Ready)](https://waffle.io/maidsafe/tokio_utp)|
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the crates.io links may remain valid after the renaming, but not so sure about the others. To be safe (and consistent with our other projects), it'd be better to change all instances of tokio-utp to tokio_utp except the AppVeyor link.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed name = back to tokio-utp so that should resolve this issue (no crate renaming will occur). Means inconsistency within this file as crate, docs and Appveyor links will still be tokio-utp, while the rest will be tokio_utp.


| [MaidSafe website](https://maidsafe.net) | [SAFE Dev Forum](https://forum.safedev.org) | [SAFE Network Forum](https://safenetforum.org) |
|:----------------------------------------:|:-------------------------------------------:|:----------------------------------------------:|

## License

Licensed under the ([MIT](LICENSE)) license.
This SAFE Network library is dual-licensed under the Modified BSD ([LICENSE-BSD](LICENSE-BSD) https://opensource.org/licenses/BSD-3-Clause) or the MIT license ([LICENSE-MIT](LICENSE-MIT) https://opensource.org/licenses/MIT) at your option.

## Contribution

Copyrights in the SAFE Network are retained by their contributors. No copyright assignment is required to contribute to this project.
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ environment:
global:
RUST_BACKTRACE: 1
matrix:
- RUST_TOOLCHAIN: 1.26.1
- RUST_TOOLCHAIN: 1.26.2

cache:
- '%USERPROFILE%\.cargo'
Expand Down