Merge remote-tracking branch 'origin/master' into futures

# Conflicts:
#	.github/workflows/rust_and_ros2.yml
This commit is contained in:
Kristofer Bengtsson 2021-07-06 16:06:31 +02:00
commit fae64ec6ce
1 changed files with 2 additions and 6 deletions

View File

@ -1,10 +1,6 @@
name: Rust
name: testing_ros
on:
push:
branches: [ futures ]
pull_request:
branches: [ futures ]
on: [push, pull_request]
env:
CARGO_TERM_COLOR: always