diff --git a/.circleci/config.yml b/.circleci/config.yml index cd3d70517..978b09b25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,12 +138,6 @@ jobs: - py-docs - wheelhouse - remote_tests_rust: - machine: true - steps: - - checkout - - run: ci_scripts/remote_tests_rust.sh - remote_tests_python: machine: true steps: @@ -178,11 +172,6 @@ workflows: jobs: # - cargo_fetch - - remote_tests_rust: - filters: - tags: - only: /.*/ - - remote_tests_python: filters: tags: diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 000000000..e3776ccbc --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,51 @@ +on: push +name: Build and Test +jobs: + + build_and_test: + name: Build and test + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + rust: [nightly, beta, stable] + + steps: + - uses: actions/checkout@master + + - name: Install ${{ matrix.rust }} + uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + + - name: Cache cargo registry + uses: actions/cache@v2 + with: + path: ~/.cargo/registry + key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-registry-${{ hashFiles('**/Cargo.toml') }} + + - name: Cache cargo index + uses: actions/cache@v2 + with: + path: ~/.cargo/git + key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-index-${{ hashFiles('**/Cargo.toml') }} + + - name: Cache cargo build + uses: actions/cache@v2 + with: + path: target + key: ${{ matrix.os }}-${{ matrix.rust }}-cargo-build-target-${{ hashFiles('**/Cargo.toml') }} + + - name: check + uses: actions-rs/cargo@v1 + with: + command: check + args: --workspacke --all --bins --examples --tests + + - name: tests + uses: actions-rs/cargo@v1 + with: + command: test + args: --workspace + diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 7d05bec11..3f10a83c3 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -2,21 +2,6 @@ on: push name: Code Quality jobs: - check: - name: Check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: 1.43.1 - override: true - - uses: actions-rs/cargo@v1 - with: - command: check - args: --workspace --examples --tests --all-features - fmt: name: Rustfmt runs-on: ubuntu-latest @@ -31,7 +16,7 @@ jobs: - uses: actions-rs/cargo@v1 with: command: fmt - args: --all -- --check + args: --workspace -- --check run_clippy: runs-on: ubuntu-latest @@ -46,3 +31,4 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} args: --all-features + diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index b8ea374f3..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,19 +0,0 @@ -environment: - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - -install: - - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - - rustup-init -yv --default-toolchain nightly-2020-03-19 - - set PATH=%PATH%;%USERPROFILE%\.cargo\bin - - rustc -vV - - cargo -vV - -build: false - -test_script: - - cargo test --release --all - -cache: - - target - - C:\Users\appveyor\.cargo\registry