Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 4 additions & 31 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ jobs:
if: matrix.os == 'windows-latest'
run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old

# Work around https://github.com/actions/cache/issues/403 by using GNU tar
# instead of BSD tar.
- name: Install GNU tar
if: matrix.os == 'macos-latest'
run: |
brew install gnu-tar
echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
Expand All @@ -58,29 +50,15 @@ jobs:
override: true
components: rustfmt, rust-src

- name: Cache cargo directories
uses: actions/cache@v2
Comment thread
Swatinem marked this conversation as resolved.
with:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

- name: Cache cargo target dir
uses: actions/cache@v2
with:
path: target
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
- name: Cache Dependencies
uses: Swatinem/rust-cache@ce325b60658c1b38465c06cc965b79baf32c1e72

- name: Compile
run: cargo test --no-run --locked

- name: Test
run: cargo test

- name: Prepare cache
run: cargo xtask pre-cache

# Weird targets to catch non-portable code
rust-cross:
name: Rust Cross
Expand All @@ -103,13 +81,8 @@ jobs:
- name: Install Rust targets
run: rustup target add ${{ env.targets }}

- name: Cache cargo directories
uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Cache Dependencies
uses: Swatinem/rust-cache@ce325b60658c1b38465c06cc965b79baf32c1e72

- name: Check
run: |
Expand Down
5 changes: 0 additions & 5 deletions xtask/src/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ xflags::xflags! {
}

cmd fuzz-tests {}
cmd pre-cache {}

cmd release {
optional --dry-run
Expand Down Expand Up @@ -63,7 +62,6 @@ pub enum XtaskCmd {
Help(Help),
Install(Install),
FuzzTests(FuzzTests),
PreCache(PreCache),
Release(Release),
Promote(Promote),
Dist(Dist),
Expand Down Expand Up @@ -91,9 +89,6 @@ pub struct Lint;
#[derive(Debug)]
pub struct FuzzTests;

#[derive(Debug)]
pub struct PreCache;

#[derive(Debug)]
pub struct Release {
pub dry_run: bool,
Expand Down
2 changes: 0 additions & 2 deletions xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ mod install;
mod release;
mod dist;
mod metrics;
mod pre_cache;

use anyhow::{bail, Result};
use std::{
Expand All @@ -41,7 +40,6 @@ fn main() -> Result<()> {
}
flags::XtaskCmd::Install(cmd) => cmd.run(),
flags::XtaskCmd::FuzzTests(_) => run_fuzzer(),
flags::XtaskCmd::PreCache(cmd) => cmd.run(),
flags::XtaskCmd::Release(cmd) => cmd.run(),
flags::XtaskCmd::Promote(cmd) => cmd.run(),
flags::XtaskCmd::Dist(flags) => {
Expand Down
79 changes: 0 additions & 79 deletions xtask/src/pre_cache.rs

This file was deleted.