Skip to content

Commit

Permalink
Update deprecated settings (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
athackst authored Jul 14, 2023
1 parent 9333234 commit d21497c
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 27 deletions.
42 changes: 22 additions & 20 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
"WORKSPACE": "${containerWorkspaceFolder}"
}
},
"settings": {
"terminal.integrated.profiles.linux": {
"bash": {
"path": "bash"
}
}
},
"runArgs": [
"--privileged", // For joystick tests
"--network=host", // For ros comm ports
Expand All @@ -25,18 +18,27 @@
"--volume=/tmp/.X11-unix:/tmp/.X11-unix"
],
"containerEnv": {
"DISPLAY": "${localEnv:DISPLAY}", // For display sharing
"DISPLAY": "${localEnv:DISPLAY}" // For display sharing
},
"postCreateCommand": "sudo apt-get update && rosdep update && rosdep install --from-paths . --ignore-src -y",
// Local aliases settings as mounts
"mounts": [
"source=/${env:HOME}/.bash_aliases,target=/home/ros/.bash_aliases,type=bind,consistency=cached",
"source=/${env:HOME}/.aliases,target=/home/ros/.aliases,type=bind,consistency=cached"
],
"postCreateCommand": ".devcontainer/postcreate.sh",
"remoteUser": "ros",
"extensions": [
"dotjoshjohnson.xml",
"ms-iot.vscode-ros",
"ms-vscode.cpptools",
"redhat.vscode-yaml",
"streetsidesoftware.code-spell-checker",
"twxs.cmake",
"yzhang.markdown-all-in-one",
"znck.grammarly"
]
}
"customizations": {
"vscode": {
"extensions": [
"dotjoshjohnson.xml",
"ms-iot.vscode-ros",
"ms-vscode.cpptools",
"redhat.vscode-yaml",
"streetsidesoftware.code-spell-checker",
"twxs.cmake",
"yzhang.markdown-all-in-one"
]
}
},

}
7 changes: 7 additions & 0 deletions .devcontainer/postcreate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
set -e

sudo apt-get update

rosdep update --ros-distro $ROS_DISTRO
rosdep install --from-paths . --ignore-src -y --rosdistro $ROS_DISTRO
9 changes: 5 additions & 4 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3.5.3
- name: Setup config
uses: athackst/athackst.mkdocs@main
- name: Build and push docs to gh-pages
Expand All @@ -22,6 +22,7 @@ jobs:
uses: athackst/htmlproofer-action@main
with:
directory: site
url_ignore_re: |
http://sdformat.org/*
https://gazebosim.org/*
ignore_urls: |
https://fonts.gstatic.com
/http://sdformat.org/
/https://gazebosim.org/
14 changes: 11 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
{
"ros.distro": "melodic",
"python.pythonPath": "/usr/bin/python3",
"grammarly.domain": "technical",
"grammarly.hideUnavailablePremiumAlerts": true,
"cSpell.words": [
"fdir",
"sdformat"
],
"cSpell.ignorePaths": [
"package-lock.json",
"node_modules",
"vscode-extension",
".git/objects",
".vscode",
".vscode-insiders",
".devcontainer",
".github"
]
}
}

0 comments on commit d21497c

Please sign in to comment.