diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d8962ce..509bed2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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 @@ -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" - ] -} \ No newline at end of file + "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" + ] + } + }, + +} diff --git a/.devcontainer/postcreate.sh b/.devcontainer/postcreate.sh new file mode 100755 index 0000000..405b379 --- /dev/null +++ b/.devcontainer/postcreate.sh @@ -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 diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 0565fb0..bfa3830 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -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 @@ -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/ diff --git a/.vscode/settings.json b/.vscode/settings.json index dfd5a80..dc938f3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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" ] -} \ No newline at end of file +}