Skip to content
This repository was archived by the owner on Jan 30, 2024. It is now read-only.

Update CI #366

Merged
merged 7 commits into from
Dec 5, 2022
Merged
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
30 changes: 7 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -6,32 +6,22 @@ on:
pull_request:
branches: [ main ]

env:
CARGO_TERM_COLOR: always
RUSTFLAGS: "--deny warnings"

# NOTE if you add, remove or rename a job you'll need to update the list of
# jobs in the `ci` step (at the bottom of this file)
jobs:
test:
strategy:
matrix:
rust:
- stable
- nightly
os:
- ubuntu-latest
- macOS-latest
- windows-latest
runs-on: ${{ matrix.os }}
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- uses: actions/checkout@v3
- name: Use the latest stable release
run: rustup update stable && rustup default stable
- name: Install C libraries for tooling
if: matrix.os == 'ubuntu-latest'
run: sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev
@@ -42,20 +32,14 @@ jobs:
static:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
components: clippy, rustfmt
- uses: actions/checkout@v3
- name: Use the latest stable release
run: rustup update stable && rustup default stable
- name: Install C libraries for tooling
run: sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev

- run: cargo fmt -- --check
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- run: cargo clippy -- -D warnings

# Refs: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149
# bors.tech integration
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

- [#366] Update CI

[#366]: https://github.com/knurling-rs/probe-run/pull/366

## [v0.3.5] - 2022-10-07

- [#357] Update to `clap 4.0`
2 changes: 1 addition & 1 deletion src/backtrace/symbolicate.rs
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ impl Subroutine {
.and_then(|file| loc.line.map(|line| (file, line, loc.column)))
}) {
let fullpath = Path::new(file);
let (path, is_local) = if let Ok(relpath) = fullpath.strip_prefix(&current_dir) {
let (path, is_local) = if let Ok(relpath) = fullpath.strip_prefix(current_dir) {
(relpath, true)
} else {
(fullpath, false)
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
@@ -378,7 +378,7 @@ fn location_info(
locations
.map(|locations| &locations[&frame.index()])
.map(|location| {
let path = if let Ok(relpath) = location.file.strip_prefix(&current_dir) {
let path = if let Ok(relpath) = location.file.strip_prefix(current_dir) {
relpath.display().to_string()
} else {
let dep_path = dep::Path::from_std_path(&location.file);
2 changes: 1 addition & 1 deletion tests/snapshot.rs
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ fn run_command(args: &str) -> (os_pipe::PipeReader, std::process::Child) {
let writer_clone = writer.try_clone().unwrap();

let handle = Command::new("cargo")
.args(cmd.split(" "))
.args(cmd.split(' '))
// capture stderr and stdout while preserving line order
.stdout(writer)
.stderr(writer_clone)