diff --git a/.github/workflows/humble.yaml b/.github/workflows/humble.yaml index c2a76631..cc6fe514 100644 --- a/.github/workflows/humble.yaml +++ b/.github/workflows/humble.yaml @@ -1,30 +1,15 @@ -name: Humble CI +name: Humble CI - Build and Test + on: push: branches: - - 'main' + - 'humble' pull_request: workflow_dispatch: branches: - '*' + jobs: build_and_test: - runs-on: ubuntu-latest - permissions: - contents: read - packages: read - container: - image: ghcr.io/naturerobots/ros2_humble_build:latest - credentials: - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - options: - --user root - steps: - - uses: actions/checkout@v4 - - uses: ros-tooling/action-ros-ci@0.3.13 - with: - target-ros2-distro: humble - vcs-repo-file-url: $GITHUB_WORKSPACE/source_dependencies.yaml - rosdep-check: true - import-token: ${{ secrets.ORGANIZATION_PRIVATE_PAT }} + uses: naturerobots/github_automation_public/.github/workflows/humble_ci.yaml@main + secrets: inherit \ No newline at end of file diff --git a/README.md b/README.md index 250d5a1a..3420f15c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -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. -Mainly created in order to get a separate issues tracker. - -* The `humble` branch is the main branch and is being actively developed -* The `noetic` branch tracks the ROS1 state from [Magazino's move_base_flex](https://github.com/magazino/move_base_flex). +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). # Move Base Flex: A Highly Flexible Navigation Framework: