Skip to content

Commit

Permalink
Depend on the cargo-ament-build Python wheel (#27)
Browse files Browse the repository at this point in the history
* Depend on the cargo-ament-build Python wheel

Signed-off-by: Esteve Fernandez <esteve@apache.org>

* Added dependency to the Python toml package

Signed-off-by: Esteve Fernandez <esteve@apache.org>

* ci: remove cargo install cargo-ament-build from CI

Signed-off-by: Esteve Fernandez <esteve@apache.org>

* ci: added custom strategy.json

Signed-off-by: Esteve Fernandez <esteve@apache.org>

* Revert to upstream action

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>

* Try a jq to remove Ubuntu 20.04

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>

---------

Signed-off-by: Esteve Fernandez <esteve@apache.org>
Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
Co-authored-by: Luca Della Vedova <lucadv@intrinsic.ai>
  • Loading branch information
esteve and luca-della-vedova authored Oct 17, 2024
1 parent a1c4900 commit 7a8aa2e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 90 deletions.
11 changes: 0 additions & 11 deletions .github/actions/local_pytest/action.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:

jobs:
pytest:
uses: ./.github/workflows/pytest.yaml
uses: colcon/ci/.github/workflows/pytest.yaml@main
with:
prerun-step: 'cargo install cargo-ament-build'
matrix-filter: del(.matrix.include[] | select(.os == "ubuntu-20.04"))
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
76 changes: 0 additions & 76 deletions .github/workflows/pytest.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ keywords = colcon

[options]
install_requires =
cargo-ament-build
colcon-core
# to set an environment variable when a package installs a library
colcon-library-path
colcon-cargo
colcon-ros
toml
packages = find:
zip_safe = true

Expand Down
2 changes: 1 addition & 1 deletion stdeb.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[colcon-ros-cargo]
No-Python2:
Depends3: python3-colcon-core, python3-colcon-cargo, python3-toml
Depends3: python3-colcon-core, python3-colcon-cargo, python3-toml, python3-cargo-ament-build
Suite: focal jammy noble bookworm trixie
X-Python3-Version: >= 3.6

0 comments on commit 7a8aa2e

Please sign in to comment.