mirror of
https://github.com/radareorg/radeco.git
synced 2026-11-07 06:36:01 -10:00
Update dependencies, CI fixes
This commit is contained in:
1 parent
50666e2efb
commit
39cd7c8755
5 files changed
+36
-9
No files matched your search
@@ -5,6 +5,8 @@ branches:
|
||||
- master
|
||||
|
||||
environment:
|
||||
LLVM_VERSION: 9.0.1
|
||||
PLATFORM: x64
|
||||
matrix:
|
||||
# Allow failure for stable channel because
|
||||
# some used Rust features are not available yet
|
||||
@@ -23,8 +25,10 @@ environment:
|
||||
# target: x86_64-pc-windows-msvc
|
||||
- channel: nightly
|
||||
target: i686-pc-windows-msvc
|
||||
type: msvc
|
||||
- channel: nightly
|
||||
target: x86_64-pc-windows-msvc
|
||||
type: msvc
|
||||
|
||||
#- channel: beta
|
||||
# target: i686-pc-windows-gnu
|
||||
@@ -32,15 +36,35 @@ environment:
|
||||
# target: x86_64-pc-windows-gnu
|
||||
- channel: nightly
|
||||
target: i686-pc-windows-gnu
|
||||
type: gnu
|
||||
- channel: nightly
|
||||
target: x86_64-pc-windows-gnu
|
||||
type: gnu
|
||||
|
||||
install:
|
||||
- if %PLATFORM% == x86 (set RUST_PLATFORM=i686&set MINGW_BITS=32) else (set RUST_PLATFORM=x86_64&set MINGW_BITS=64)
|
||||
- ps: >-
|
||||
If ($env:target -eq 'x86_64-pc-windows-gnu') {
|
||||
$env:PATH += ';C:\msys64\mingw64\bin'
|
||||
} ElseIf ($env:target -eq 'i686-pc-windows-gnu') {
|
||||
$env:PATH += ';C:\msys64\mingw32\bin'
|
||||
}
|
||||
- appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
|
||||
- rustup-init -yv --default-toolchain %channel% --default-host %target%
|
||||
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin
|
||||
- rustc -vV
|
||||
- cargo -vV
|
||||
# Install LLVM for GNU
|
||||
- if %type%==gnu set PATH=C:\msys64\mingw%MINGW_BITS%\bin;C:\msys64\usr\bin;%PATH%
|
||||
- if %type%==gnu set "MINGW_URL=http://repo.msys2.org/mingw/%RUST_PLATFORM%/mingw-w64-%RUST_PLATFORM%"
|
||||
- if %type%==gnu set "URL_VER=%LLVM_VERSION%-1-any.pkg.tar.xz"
|
||||
- if %type%==gnu bash -lc "pacman -U --noconfirm $MINGW_URL-clang-$URL_VER $MINGW_URL-llvm-$URL_VER"
|
||||
- if %type%==gnu bash -lc "clang --version"
|
||||
# Use preinstalled LLVM for MSVC
|
||||
- if %type%==msvc set PATH=%PATH%;C:\Program Files\LLVM\bin
|
||||
- if %type%==msvc where clang
|
||||
- if %type%==msvc clang --version
|
||||
|
||||
build_script:
|
||||
- cargo build -vv
|
||||
test_script:
|
||||
|
||||
+2
-2
@@ -77,8 +77,8 @@ before_script:
|
||||
# the main build
|
||||
script:
|
||||
- |
|
||||
cargo build --verbose --no-default-features &&
|
||||
cargo test --verbose --no-default-features &&
|
||||
cargo build --verbose &&
|
||||
cargo test --verbose &&
|
||||
chmod 644 radeco-lib/src/middle/ir_reader/parser.rs &&
|
||||
if [ "${CHECKFMT}" == "1" ]; then
|
||||
rustfmt radeco-lib/src/middle/ir_reader/parser.rs
|
||||
|
||||
@@ -21,7 +21,7 @@ quickcheck = "0.8.5"
|
||||
quickcheck_macros = "0.8.0"
|
||||
|
||||
[build-dependencies]
|
||||
lalrpop = "0.17"
|
||||
lalrpop = { version = "0.18", features = ["lexer"] }
|
||||
regex = "1.3"
|
||||
|
||||
[dependencies]
|
||||
@@ -31,15 +31,15 @@ serde_json = "1.0"
|
||||
lazy_static = "1.4"
|
||||
docopt = "1.1"
|
||||
rayon = "1.2"
|
||||
lalrpop-util = "0.17"
|
||||
lalrpop-util = "0.18"
|
||||
fixedbitset = "0.2"
|
||||
either = "1.5"
|
||||
vec_map = "0.8"
|
||||
typed-arena = "1.7"
|
||||
typed-arena = "2.0"
|
||||
bit-set = "0.5"
|
||||
num = "0.2"
|
||||
linear-map = "1.2.0"
|
||||
base64 = "0.9.2"
|
||||
base64 = "0.12"
|
||||
|
||||
log = { version = "0.4", optional = true }
|
||||
env_logger = { version = "0.7", optional = true }
|
||||
|
||||
+3
-3
@@ -17,11 +17,11 @@ trace_log = ["radeco-lib/trace_log", "log", "env_logger"]
|
||||
|
||||
[dependencies]
|
||||
rustc-serialize = "*"
|
||||
base64 = "0.11"
|
||||
rustyline = "5.0"
|
||||
base64 = "0.12"
|
||||
rustyline = "6.0"
|
||||
lazy_static = "1.4"
|
||||
clap = "2.33"
|
||||
syntect = "3.3"
|
||||
syntect = "4.1"
|
||||
|
||||
log = { version = "0.4", optional = true }
|
||||
env_logger = { version = "0.7", optional = true }
|
||||
|
||||
@@ -21,6 +21,7 @@ use rustyline::completion::{Completer, FilenameCompleter};
|
||||
use rustyline::error::ReadlineError;
|
||||
use rustyline::highlight::Highlighter;
|
||||
use rustyline::hint::Hinter;
|
||||
use rustyline::validate::Validator;
|
||||
use rustyline::{CompletionType, Config, Context, EditMode, Editor, Helper};
|
||||
use std::fs;
|
||||
use std::process;
|
||||
@@ -61,6 +62,8 @@ struct Completes {
|
||||
file_completer: FilenameCompleter,
|
||||
}
|
||||
|
||||
impl Validator for Completes {}
|
||||
|
||||
impl Helper for Completes {}
|
||||
|
||||
impl Hinter for Completes {
|
||||
|
||||
Reference in new issue
Block a user