Skip to content

Commit dd7b125

Browse files
authored
Fix/migration fixup (#39)
* change first section of readme to better reflect state after migration * change CI to use reusable workflow
1 parent 4a8e343 commit dd7b125

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

.github/workflows/humble.yaml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
1-
name: Humble CI
1+
name: Humble CI - Build and Test
2+
23
on:
34
push:
45
branches:
5-
- 'main'
6+
- 'humble'
67
pull_request:
78
workflow_dispatch:
89
branches:
910
- '*'
11+
1012
jobs:
1113
build_and_test:
12-
runs-on: ubuntu-latest
13-
permissions:
14-
contents: read
15-
packages: read
16-
container:
17-
image: ghcr.io/naturerobots/ros2_humble_build:latest
18-
credentials:
19-
username: ${{ github.actor }}
20-
password: ${{ secrets.GITHUB_TOKEN }}
21-
options:
22-
--user root
23-
steps:
24-
- uses: actions/checkout@v4
25-
- uses: ros-tooling/action-ros-ci@0.3.13
26-
with:
27-
target-ros2-distro: humble
28-
vcs-repo-file-url: $GITHUB_WORKSPACE/source_dependencies.yaml
29-
rosdep-check: true
30-
import-token: ${{ secrets.ORGANIZATION_PRIVATE_PAT }}
14+
uses: naturerobots/github_automation_public/.github/workflows/humble_ci.yaml@main
15+
secrets: inherit

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
This repo is an internal hard fork of [Magazino's move_base_flex](https://github.com/magazino/move_base_flex), with our ROS2 migration changes on top.
2-
Mainly created in order to get a separate issues tracker.
3-
4-
* The `humble` branch is the main branch and is being actively developed
5-
* The `noetic` branch tracks the ROS1 state from [Magazino's move_base_flex](https://github.com/magazino/move_base_flex).
1+
This is the active ROS2 branch of this repository. If your are looking for the ROS1 version, checkout the [noetic branch](https://github.com/naturerobots/move_base_flex/tree/noetic).
62

73
# Move Base Flex: A Highly Flexible Navigation Framework:
84

0 commit comments

Comments
 (0)