Skip to content

Commit

Permalink
more pretty
Browse files Browse the repository at this point in the history
  • Loading branch information
InvincibleRMC committed Feb 17, 2024
1 parent a80a03a commit d439fcc
Show file tree
Hide file tree
Showing 6 changed files with 146 additions and 152 deletions.
234 changes: 117 additions & 117 deletions .cspell.json
Original file line number Diff line number Diff line change
@@ -1,119 +1,119 @@
{
"ignorePaths": [
"**/node_modules/**",
"**/vscode-extension/**",
"**/.git/**",
"**/.pnpm-lock.json",
"package-lock.json",
"megalinter-reports"
],
"language": "en",
"version": "0.2",
"words": [
"BGGR",
"CCACHE",
"Carlstrom",
"Colcon",
"DGRAM",
"DISTRO",
"DPADHOR",
"DEVSKIM",
"DPADVERT",
"JSONLINT",
"KICS",
"LJOYPRESS",
"LJOYX",
"LJOYY",
"MYPY",
"Manip",
"Mollerstuen",
"NOPASSWD",
"Numpy",
"PYLINT",
"PYTHONWARNINGS",
"Pixhawk",
"Pixmap",
"Poulin",
"RJOYPRESS",
"RJOYX",
"RJOYY",
"Realsense",
"SIOCGIFADDR",
"Seagrass",
"Seongmin",
"Shellscripts",
"Spinview",
"URDF",
"Ubotix",
"Xlaunch",
"Xquartz",
"azuretools",
"blackfly",
"btns",
"bttn",
"ccache",
"clearpathrobotics",
"colcon",
"cwru",
"cwrubotix",
"cwrurobotics",
"devcontainer",
"devel",
"dfsg",
"distro",
"ethernets",
"geographiclib",
"hadolint",
"heheheha",
"ifname",
"imgmsg",
"inputed",
"isort",
"libxcb",
"lsusb",
"manip",
"mavros",
"mypy",
"netplan",
"nmcli",
"ntoa",
"opencv",
"osrf",
"pipefail",
"pixhawk",
"pycache",
"pylint",
"pynput",
"pyproject",
"pyqt",
"pyqtdarktheme",
"pyright",
"pytest",
"pytestqt",
"qdarktheme",
"qtbot",
"rclpy",
"realsense",
"reflashing",
"remappings",
"rosdep",
"rosdeps",
"rosout",
"schematypens",
"scps",
"seagrass",
"setuptools",
"shellcheck",
"socat",
"stefanzweifel",
"udev",
"usbutils",
"venv",
"wlan",
"xacro",
"xhost",
"xquartz",
"xvfb"
],
"enabled": true
"ignorePaths": [
"**/node_modules/**",
"**/vscode-extension/**",
"**/.git/**",
"**/.pnpm-lock.json",
"package-lock.json",
"megalinter-reports"
],
"language": "en",
"version": "0.2",
"words": [
"BGGR",
"CCACHE",
"Carlstrom",
"Colcon",
"DGRAM",
"DISTRO",
"DPADHOR",
"DEVSKIM",
"DPADVERT",
"JSONLINT",
"KICS",
"LJOYPRESS",
"LJOYX",
"LJOYY",
"MYPY",
"Manip",
"Mollerstuen",
"NOPASSWD",
"Numpy",
"PYLINT",
"PYTHONWARNINGS",
"Pixhawk",
"Pixmap",
"Poulin",
"RJOYPRESS",
"RJOYX",
"RJOYY",
"Realsense",
"SIOCGIFADDR",
"Seagrass",
"Seongmin",
"Shellscripts",
"Spinview",
"URDF",
"Ubotix",
"Xlaunch",
"Xquartz",
"azuretools",
"blackfly",
"btns",
"bttn",
"ccache",
"clearpathrobotics",
"colcon",
"cwru",
"cwrubotix",
"cwrurobotics",
"devcontainer",
"devel",
"dfsg",
"distro",
"ethernets",
"geographiclib",
"hadolint",
"heheheha",
"ifname",
"imgmsg",
"inputed",
"isort",
"libxcb",
"lsusb",
"manip",
"mavros",
"mypy",
"netplan",
"nmcli",
"ntoa",
"opencv",
"osrf",
"pipefail",
"pixhawk",
"pycache",
"pylint",
"pynput",
"pyproject",
"pyqt",
"pyqtdarktheme",
"pyright",
"pytest",
"pytestqt",
"qdarktheme",
"qtbot",
"rclpy",
"realsense",
"reflashing",
"remappings",
"rosdep",
"rosdeps",
"rosout",
"schematypens",
"scps",
"seagrass",
"setuptools",
"shellcheck",
"socat",
"stefanzweifel",
"udev",
"usbutils",
"venv",
"wlan",
"xacro",
"xhost",
"xquartz",
"xvfb"
],
"enabled": true
}
5 changes: 2 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ permissions: read-all
# Configures this workflow to run every time a change is pushed to a branch in the branches array.
on:
push:
branches: ['main']
branches: ["main"]

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
Expand All @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v4
with:
# Clone submodules as well
submodules: 'true'
submodules: "true"
# Follow this https://stackoverflow.com/questions/60222741/github-actions-and-git-clone-issue
# For help setting up in the future
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
Expand Down Expand Up @@ -56,4 +56,3 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
...
9 changes: 4 additions & 5 deletions .github/workflows/industrial_ci_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,16 @@ jobs:
restore-keys: |
ccache-${{ matrix.ROS_DISTRO }}-${{ matrix.ROS_REPO }}-
- uses: 'ros-industrial/industrial_ci@master' # run industrial_ci
- uses: "ros-industrial/industrial_ci@master" # run industrial_ci
env: # either pass all entries explicitly
# Added back so testing without Dockerfile can be done
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
DOCKER_IMAGE: ghcr.io/cwrurobotics/rov-24:iron
ROS_REPO: ${{ matrix.ROS_REPO }}
# Install missing libxcb-cursor0 xvfb for PyQt unit testing
# https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html
ADDITIONAL_DEBS: 'libxcb-cursor0 xvfb'
ADDITIONAL_DEBS: "libxcb-cursor0 xvfb"
# Crazy one liner for install python dependencies
AFTER_INSTALL_TARGET_DEPENDENCIES_EMBED: 'pip install --upgrade pip && pip install /root/target_ws/src/rov-24 --user && rm -r /root/target_ws/src/rov-24/build'
AFTER_INSTALL_TARGET_DEPENDENCIES_EMBED: "pip install --upgrade pip && pip install /root/target_ws/src/rov-24 --user && rm -r /root/target_ws/src/rov-24/build"
# Used for running our CI but don't necessarily want to run others failing unit tests (ej. robot_upstart)
UPSTREAM_WORKSPACE: 'github:clearpathrobotics/robot_upstart#foxy-devel'
...
UPSTREAM_WORKSPACE: "github:clearpathrobotics/robot_upstart#foxy-devel"
25 changes: 11 additions & 14 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ on:

# Comment env block if you do not want to apply fixes
# env:
# Apply linter fixes configuration
#
# When active, APPLY_FIXES must also be defined as environment variable
# (in github/workflows/mega-linter.yml or other CI tool)
# APPLY_FIXES: all
# Apply linter fixes configuration
#
# When active, APPLY_FIXES must also be defined as environment variable
# (in github/workflows/mega-linter.yml or other CI tool)
# APPLY_FIXES: all

# Decide which event triggers application of fixes in a commit or a PR
# (pull_request, push, all)
# APPLY_FIXES_EVENT: pull_request
# Decide which event triggers application of fixes in a commit or a PR
# (pull_request, push, all)
# APPLY_FIXES_EVENT: pull_request

# If APPLY_FIXES is used, defines if the fixes are directly committed (commit)
# or posted in a PR (pull_request)
# APPLY_FIXES_MODE: pull_request
# If APPLY_FIXES is used, defines if the fixes are directly committed (commit)
# or posted in a PR (pull_request)
# APPLY_FIXES_MODE: pull_request

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
Expand All @@ -46,7 +46,6 @@ jobs:
pull-requests: write

steps:

# Git Checkout
- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -69,7 +68,6 @@ jobs:
# All available variables are described in documentation
# https://megalinter.io/latest/configuration/
env:

# Validates all source when push on main, else just the git diff with
# main. Override with true if you always want to lint all sources
#
Expand Down Expand Up @@ -171,4 +169,3 @@ jobs:
commit_message: "[MegaLinter] Apply linters fixes"
commit_user_name: megalinter-bot
commit_user_email: [email protected]
...
22 changes: 11 additions & 11 deletions .markdown-link-check.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"ignorePatterns": [
{
"pattern": "^/doc/images"
}
],
"replacementPatterns": [
{
"pattern": "^/",
"replacement": "{{BASEURL}}/rov-24/"
}
]
"ignorePatterns": [
{
"pattern": "^/doc/images"
}
],
"replacementPatterns": [
{
"pattern": "^/",
"replacement": "{{BASEURL}}/rov-24/"
}
]
}
3 changes: 1 addition & 2 deletions .mega-linter.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
# Hadolint config files funky right now.
DOCKERFILE_HADOLINT_ARGUMENTS:
--ignore SC1091
DOCKERFILE_HADOLINT_ARGUMENTS: --ignore SC1091

PYTHON_MYPY_CONFIG_FILE: pyproject.toml
PYTHON_BLACK_CONFIG_FILE: pyproject.toml
Expand Down

0 comments on commit d439fcc

Please sign in to comment.