Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/foxy' into dashing
Browse files Browse the repository at this point in the history
  • Loading branch information
athackst committed Jun 16, 2021
2 parents 971972a + 636a19d commit d5968c1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM athackst/ros2:dashing-dev
FROM althack/ros2:dashing-dev

# ** [Optional] Uncomment this section to install additional packages. **
#
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Build and push docs
uses: athackst/mkdocs-simple-plugin@v0.8.1
uses: athackst/mkdocs-simple-plugin@v1.0.0
with:
publish_branch: gh-pages-dashing
edit_uri: edit/dashing/
5 changes: 4 additions & 1 deletion .github/workflows/ros.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: ROS

on:
pull_request:
push:
branches:
- "dashing"
workflow_dispatch:

jobs:
Expand All @@ -19,7 +22,7 @@ jobs:
bash -c "
vcs import --skip-existing < src/ros2.repos src \
&& apt-get update \
&& rosdep update \
&& rosdep update --include-eol-distros \
&& rosdep install --from-paths src --ignore-src -y --rosdistro=dashing \
&& colcon build --cmake-args '-DCMAKE_BUILD_TYPE=Release' -Wall -Wextra -Wpedantic \
&& colcon test \
Expand Down
2 changes: 1 addition & 1 deletion .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"/opt/ros/foxy/include/**"
"/opt/ros/dashing/include/**"
],
"defines": [],
"compilerPath": "/usr/bin/gcc",
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"**/log": true
},
"python.analysis.extraPaths": [
"/opt/ros/foxy/lib/python3.6/site-packages/"
"/opt/ros/dashing/lib/python3.6/site-packages/"
],
"cSpell.allowCompoundWords": true,
"cSpell.ignorePaths": [
Expand Down

0 comments on commit d5968c1

Please sign in to comment.