Skip to content
This repository was archived by the owner on Dec 10, 2022. It is now read-only.

Commit ae02e6e

Browse files
committed
chore(win): copy from suhr's works
1 parent f041d14 commit ae02e6e

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.appveyor.yml

+16-17
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,27 @@ branches:
1212

1313
environment:
1414
matrix:
15-
- channel: stable
16-
target: x86_64-pc-windows-gnu
15+
# stable x86_64 with static libsodium from sources
16+
- TARGET: x86_64-pc-windows-msvc
17+
RUST_CHANNEL: stable
18+
19+
# stable x86 with static libsodium from sources
20+
- TARGET: i686-pc-windows-msvc
21+
RUST_CHANNEL: stable
1722
# env variables for debugging
1823
RUST_BACKTRACE: "1"
1924

2025
install:
21-
# install libsodium
22-
- mkdir deps && cd deps
23-
- appveyor-retry appveyor DownloadFile https://download.libsodium.org/libsodium/releases/libsodium-1.0.16-mingw.tar.gz -FileName libsodium.tar.gz
24-
- 7z x libsodium.tar.gz -so | 7z x -si -ttar > nul
25-
- set SODIUM_STATIC=1
26-
- set SODIUM_LIB_DIR=C:\projects\tox-node\deps\libsodium-win64\lib
27-
- cd C:\projects\tox-node
28-
# install rustc & cargo
29-
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
30-
- rustup-init -yv --default-toolchain %channel% --default-host %target%
31-
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin
32-
- rustc -vV
33-
- cargo -vV
26+
- ps: |
27+
# Install Rust
28+
appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
29+
cmd.exe /c .\rustup-init.exe -y --default-host "$env:TARGET" --default-toolchain "$env:RUST_CHANNEL" 2`>`&1
30+
$env:PATH += ";$env:USERPROFILE\.cargo\bin"
31+
rustc -V
32+
cargo -V
3433
3534
build: false
3635

3736
test_script:
38-
- cargo build --verbose
39-
- cargo test --verbose
37+
- cargo build --verbose
38+
- cargo test --verbose

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: rust
22
rust:
3-
- 1.26.0
3+
- 1.30.1
44
- stable
55
- beta
66
- nightly

src/motd.rs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ impl RegexMatches {
2828
}
2929
}
3030

31+
/// Packet counters for both tcp and udp.
3132
pub struct Counters {
3233
tcp: Stats,
3334
udp: Stats,

0 commit comments

Comments
 (0)