Skip to content

Commit

Permalink
Update github CI scripts to use jazzy instead of rolling
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Orlov <[email protected]>
  • Loading branch information
MichaelOrlov committed Aug 9, 2024
1 parent d91d6ac commit 5debb59
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: ament_${{ matrix.linter }}
runs-on: ubuntu-latest
container:
image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
strategy:
fail-fast: false
matrix:
Expand All @@ -18,7 +18,7 @@ jobs:
- uses: ros-tooling/[email protected]
with:
linter: ${{ matrix.linter }}
distribution: rolling
distribution: jazzy
package-name: |
ros2bag
rosbag2
Expand All @@ -39,7 +39,7 @@ jobs:
name: ament_${{ matrix.linter }}
runs-on: ubuntu-latest
container:
image: rostooling/setup-ros-docker:ubuntu-focal-ros-rolling-ros-base-latest
image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
strategy:
fail-fast: false
matrix:
Expand All @@ -50,7 +50,7 @@ jobs:
- uses: ros-tooling/[email protected]
with:
linter: ${{ matrix.linter }}
distribution: rolling
distribution: jazzy
package-name: |
rosbag2_compression
rosbag2_compression_zstd
Expand All @@ -68,7 +68,7 @@ jobs:
name: ament_${{ matrix.linter }}
runs-on: ubuntu-latest
container:
image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
strategy:
fail-fast: false
matrix:
Expand All @@ -83,14 +83,14 @@ jobs:
with:
linter: ${{ matrix.linter }}
arguments: ${{ matrix.arguments }}
distribution: rolling
distribution: jazzy
package-name: rosbag2_storage_mcap

ament_lint_python: # Linters applicable to Python packages
name: ament_${{ matrix.linter }}
runs-on: ubuntu-latest
container:
image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
strategy:
fail-fast: false
matrix:
Expand All @@ -100,7 +100,7 @@ jobs:
- uses: ros-tooling/[email protected]
with:
linter: ${{ matrix.linter }}
distribution: rolling
distribution: jazzy
package-name: |
ros2bag
rosbag2_py
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- rolling
- jazzy
schedule:
# Run every hour. This helps detect flakiness,
# and broken external dependencies.
Expand All @@ -19,8 +19,8 @@ jobs:
id: action-ros-ci
uses: ros-tooling/[email protected]
with:
target-ros2-distro: rolling
vcs-repo-file-url: https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos
target-ros2-distro: jazzy
vcs-repo-file-url: https://raw.githubusercontent.com/ros2/ros2/jazzy/ros2.repos
colcon-defaults: |
{
"build": {
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
run: |
rosbag2_path=$(colcon list -p --packages-select rosbag2)/..
rosbag2_packages=$(colcon list -n --base-paths ${rosbag2_path})
source /opt/ros/rolling/setup.sh && colcon test --mixin linters-skip --packages-select ${rosbag2_packages} --packages-skip rosbag2_performance_benchmarking --event-handlers console_cohesion+ --return-code-on-test-failure --ctest-args "-L xfail" --pytest-args "-m xfail"
source /opt/ros/jazzy/setup.sh && colcon test --mixin linters-skip --packages-select ${rosbag2_packages} --packages-skip rosbag2_performance_benchmarking --event-handlers console_cohesion+ --return-code-on-test-failure --ctest-args "-L xfail" --pytest-args "-m xfail"
working-directory: ${{ steps.action-ros-ci.outputs.ros-workspace-directory-name }}
shell: bash
- name: Is regeneration of Python stubs required?
Expand Down

0 comments on commit 5debb59

Please sign in to comment.