From b3360da107501e1e8ea1abba8366401ab22999b5 Mon Sep 17 00:00:00 2001 From: phiresky Date: Tue, 18 Jun 2019 15:23:21 +0200 Subject: [PATCH] add windows to travis (broken) --- .travis.yml | 59 ++----------------------------------- appveyor.yml | 83 ---------------------------------------------------- 2 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml index 56ad2ae..f3357b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,64 +26,9 @@ addons: matrix: fast_finish: true include: - # Nightly channel. - # All *nix releases are done on the nightly channel to take advantage - # of the regex library's multiple pattern SIMD search. - - os: linux + - os: windows rust: nightly - env: TARGET=x86_64-unknown-linux-musl - - os: osx - rust: nightly - # XML_CATALOG_FILES is apparently necessary for asciidoc on macOS. - env: TARGET=x86_64-apple-darwin XML_CATALOG_FILES=/usr/local/etc/xml/catalog - #- os: linux - # rust: nightly - # env: TARGET=arm-unknown-linux-gnueabihf GCC_VERSION=4.8 - # addons: - # apt: - # packages: - # - gcc-4.8-arm-linux-gnueabihf - # - binutils-arm-linux-gnueabihf - # - libc6-armhf-cross - # - libc6-dev-armhf-cross - # # For generating man page. - # - libxslt1-dev - # - asciidoc - # - docbook-xsl - # - xsltproc - # - libxml2-utils - # Beta channel. We enable these to make sure there are no regressions in - # Rust beta releases. - - os: linux - rust: beta - env: TARGET=x86_64-unknown-linux-musl - - os: linux - rust: beta - env: TARGET=x86_64-unknown-linux-gnu - # Minimum Rust supported channel. We enable these to make sure ripgrep - # continues to work on the advertised minimum Rust version. - - os: linux - rust: 1.35.0 - env: TARGET=x86_64-unknown-linux-gnu - - os: linux - rust: 1.35.0 - env: TARGET=x86_64-unknown-linux-musl - #- os: linux - # rust: 1.35.0 - # env: TARGET=arm-unknown-linux-gnueabihf GCC_VERSION=4.8 - # addons: - # apt: - # packages: - # - gcc-4.8-arm-linux-gnueabihf - # - binutils-arm-linux-gnueabihf - # - libc6-armhf-cross - # - libc6-dev-armhf-cross - # # For generating man page. - # - libxslt1-dev - # - asciidoc - # - docbook-xsl - # - xsltproc - # - libxml2-utils + env: TARGET=x86_64-pc-windows-msvc install: ci/install.sh script: ci/script.sh before_deploy: ci/before_deploy.sh diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 8bd12ed..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,83 +0,0 @@ -# adapted from https://raw.githubusercontent.com/BurntSushi/ripgrep/master/appveyor.yml -cache: - - c:\cargo\registry - - c:\cargo\git - -init: - - mkdir c:\cargo - - mkdir c:\rustup - - SET PATH=c:\cargo\bin;%PATH% - -clone_folder: c:\projects\ripgrep_all - -environment: - CARGO_HOME: "c:\\cargo" - RUSTUP_HOME: "c:\\rustup" - CARGO_TARGET_DIR: "c:\\projects\\ripgrep_all\\target" - global: - PROJECT_NAME: ripgrep_all - RUST_BACKTRACE: full - matrix: - - TARGET: x86_64-pc-windows-gnu - CHANNEL: stable - BITS: 64 - MSYS2: 1 - - TARGET: x86_64-pc-windows-msvc - CHANNEL: stable - BITS: 64 - - TARGET: i686-pc-windows-gnu - CHANNEL: stable - BITS: 32 - MSYS2: 1 - - TARGET: i686-pc-windows-msvc - CHANNEL: stable - BITS: 32 - -matrix: - fast_finish: true - -# 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 -y --default-host %TARGET% - - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - if defined MSYS2 set PATH=C:\msys64\mingw%BITS%\bin;%PATH% - - rustc -V - - cargo -V - -# Hack to work around a harmless warning in Appveyor builds? -build: false - -# Equivalent to Travis' `script` phase -test_script: - - cargo test --verbose --all - -before_deploy: - # Generate artifacts for release - - cargo build --release - - mkdir staging - - copy target\release\rga.exe staging - - copy target\release\rga-preproc.exe staging - - ps: copy target\release\build\ripgrep*\out\_rg.ps1 staging - - cd staging - # release zipfile will look like 'ripgrep-1.2.3-x86_64-pc-windows-msvc' - - 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" - # All the zipped artifacts will be deployed - artifact: /.*\.zip/ - auth_token: - secure: vv4vBCEosGlyQjaEC1+kraP2P6O4CQSa+Tw50oHWFTGcmuXxaWS0/yEXbxsIRLpw - provider: GitHub - # deploy when a new tag is pushed and only on the stable channel - on: - CHANNEL: stable - appveyor_repo_tag: true - -branches: - only: - - /^\d+\.\d+\.\d+$/ - - master