Skip to content

Commit

Permalink
Cleanup and attempt using CI tools
Browse files Browse the repository at this point in the history
  • Loading branch information
felixdivo committed May 5, 2024
1 parent 7b1d9bd commit aa3a324
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
"dockerfile": "../Dockerfile",
"context": ".."
},
"settings": {
"terminal.integrated.defaultProfile.linux": "zsh"
},
"customizations": {
"vscode": {
"extensions": [
Expand Down
23 changes: 17 additions & 6 deletions .github/workflows/python-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,26 @@ jobs:
run:
shell: bash
steps:
-
-
name: Checkout repository
uses: actions/checkout@v3
# -
# name: Install dependencies and the package
# run: |
# apt-get update -q
# apt-get install -qy python3-pip python-is-python3 python3-colcon-ros ros-$ROS_DISTRO-example-interfaces
# pip install --upgrade pip setuptools
# python -m pip install -e './ros2_easy_test[dev]'
-
name: Install dependencies and the package
run: |
apt-get update -q && apt-get install -qy python3-pip python-is-python3 python3-colcon-ros ros-$ROS_DISTRO-example-interfaces
pip install --upgrade pip setuptools
python -m pip install -e './ros2_easy_test[dev]'
name: Setup ROS
uses: ros-tooling/[email protected]
with:
required-ros-distributions: humble
-
uses: ros-tooling/[email protected]
with:
package-name: ros2_easy_test
target-ros2-distro: humble
-
name: Check that colcon build works
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
FROM ros:humble-ros-core

# Install runtime dependencies
RUN apt-get update -q && apt-get install -qy python3-pip python-is-python3 git zsh python3-colcon-ros ros-$ROS_DISTRO-example-interfaces
RUN apt-get update -q && apt-get install -qy python3-pip python-is-python3 git ros-dev-tools ros-$ROS_DISTRO-example-interfaces

# Need to have setuptools version 64+ for editable installs
RUN pip install --upgrade pip setuptools
Expand Down

0 comments on commit aa3a324

Please sign in to comment.