Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For the ROSCon workshop we need to support Jazzy #7

Merged
merged 17 commits into from
Sep 25, 2024
Merged
29 changes: 23 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ on:

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
ros-distro: [ "humble" ]
include:
- ros-distro: jazzy
os: ubuntu-24.04
- ros-distro: humble
os: ubuntu-22.04
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
# Checkout the repository
- name: Checkout repository
Expand All @@ -29,6 +34,13 @@ jobs:
repository: boschresearch/bt_tools
ref: main
path: colcon_ws/src/bt_tools
# Remove unused packages from checked out bt_tools
- name: Remove packages we don't need
run: |
rm -rf colcon_ws/src/bt_tools/bt_live
rm -rf colcon_ws/src/bt_tools/bt_tools
rm -rf colcon_ws/src/bt_tools/bt_tools_common
rm -rf colcon_ws/src/bt_tools/bt_view
# Compile bt_tools TODO: remove after the release of bt_tools
- name: Compile bt_tools
run: |
Expand All @@ -49,14 +61,19 @@ jobs:
echo SMC_STORM_PATH=$PWD/bin/ >> $GITHUB_OUTPUT
# Update pip
- name: Update pip
run: python -m pip install --upgrade pip
run: python -m pip install ${{ matrix.os == 'ubuntu-24.04' && '--break-system-packages' || '' }} --upgrade pip
# workaround python 3.12 issue
- name: Install special fork of js2py
run: |
pip install --break-system-packages git+https://github.com/felixonmars/Js2Py.git@py3.12
if: ${{ matrix.os == 'ubuntu-24.04' }}
# install the packages
- name: Install packages
run: |
source colcon_ws/install/setup.bash # TODO: remove after the release of bt_tools
pip install jani_generator/.[dev]
pip install as2fm_common/.[dev]
pip install scxml_converter/.[dev]
pip install ${{ matrix.os == 'ubuntu-24.04' && '--break-system-packages' || '' }} jani_generator/.[dev]
pip install ${{ matrix.os == 'ubuntu-24.04' && '--break-system-packages' || '' }} as2fm_common/.[dev]
pip install ${{ matrix.os == 'ubuntu-24.04' && '--break-system-packages' || '' }} scxml_converter/.[dev]
# lint packages
# TODO: add linting
# run the tests
Expand Down
1 change: 1 addition & 0 deletions as2fm_common/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ authors = [
license = {file = "LICENSE"}
classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.12",
]
keywords = []
dependencies = [
Expand Down
1 change: 1 addition & 0 deletions jani_generator/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ authors = [
license = {file = "LICENSE"}
classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.12",
]
keywords = []
dependencies = [
Expand Down
3 changes: 2 additions & 1 deletion scxml_converter/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ authors = [
license = {file = "LICENSE"}
classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.12",
]
keywords = []
dependencies = [
"networkx",
"btlib",
# "btlib", (would be good to declare here but then this is only installable in a ros environment)
]
requires-python = ">=3.10"

Expand Down
Loading