From 2ee9060579539d025006c09c94f9a1ebcc45dcb8 Mon Sep 17 00:00:00 2001 From: Kenji Brameld Date: Sat, 30 Dec 2023 03:05:34 +0000 Subject: [PATCH 1/2] update badges and ci Signed-off-by: Kenji Brameld (cherry picked from commit 4a22fa02d320a2b33959bd64283642e5bf46cfe8) --- .github/dependabot.yml | 11 ++++++ .github/workflows/build_and_test_foxy.yaml | 34 ------------------- .../workflows/build_and_test_galactic.yaml | 34 ------------------- .github/workflows/build_and_test_humble.yaml | 4 +-- ...test_dev.yaml => build_and_test_iron.yaml} | 12 +++---- .github/workflows/build_and_test_rolling.yaml | 4 +-- README.md | 8 ++--- 7 files changed, 24 insertions(+), 83 deletions(-) create mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/build_and_test_foxy.yaml delete mode 100644 .github/workflows/build_and_test_galactic.yaml rename .github/workflows/{build_and_test_dev.yaml => build_and_test_iron.yaml} (78%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..e644b37 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# Set update schedule for GitHub Actions +# (https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot) + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" diff --git a/.github/workflows/build_and_test_foxy.yaml b/.github/workflows/build_and_test_foxy.yaml deleted file mode 100644 index 6f8baa8..0000000 --- a/.github/workflows/build_and_test_foxy.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Build and Test (foxy) - -# Controls when the action will run. -on: - # Triggers the workflow on push - push: - branches: [ foxy ] - - # Triggers the workflow on pull requests - pull_request: - branches: [ foxy ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - container: - image: ubuntu:focal - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - uses: ros-tooling/setup-ros@v0.3 - with: - use-ros2-testing: true - - uses: ros-tooling/action-ros-ci@v0.2 - with: - target-ros2-distro: foxy diff --git a/.github/workflows/build_and_test_galactic.yaml b/.github/workflows/build_and_test_galactic.yaml deleted file mode 100644 index ac93311..0000000 --- a/.github/workflows/build_and_test_galactic.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Build and Test (galactic) - -# Controls when the action will run. -on: - # Triggers the workflow on push - push: - branches: [ galactic ] - - # Triggers the workflow on pull requests - pull_request: - branches: [ galactic ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - container: - image: ubuntu:focal - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - - uses: ros-tooling/setup-ros@v0.3 - with: - use-ros2-testing: true - - uses: ros-tooling/action-ros-ci@v0.2 - with: - target-ros2-distro: galactic diff --git a/.github/workflows/build_and_test_humble.yaml b/.github/workflows/build_and_test_humble.yaml index 03a13c0..cdb1596 100644 --- a/.github/workflows/build_and_test_humble.yaml +++ b/.github/workflows/build_and_test_humble.yaml @@ -26,9 +26,9 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: ros-tooling/setup-ros@v0.3 + - uses: ros-tooling/setup-ros@v0.7 with: use-ros2-testing: true - - uses: ros-tooling/action-ros-ci@v0.2 + - uses: ros-tooling/action-ros-ci@v0.3 with: target-ros2-distro: humble diff --git a/.github/workflows/build_and_test_dev.yaml b/.github/workflows/build_and_test_iron.yaml similarity index 78% rename from .github/workflows/build_and_test_dev.yaml rename to .github/workflows/build_and_test_iron.yaml index 40d132a..677fd61 100644 --- a/.github/workflows/build_and_test_dev.yaml +++ b/.github/workflows/build_and_test_iron.yaml @@ -1,16 +1,16 @@ # This is a basic workflow to help you get started with Actions -name: Build and Test (dev) +name: Build and Test (iron) # Controls when the action will run. on: # Triggers the workflow on push push: - branches: [ dev ] + branches: [ rolling ] # Triggers the workflow on pull requests pull_request: - branches: [ dev ] + branches: [ rolling ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -26,9 +26,9 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: ros-tooling/setup-ros@v0.3 + - uses: ros-tooling/setup-ros@v0.7 with: use-ros2-testing: true - - uses: ros-tooling/action-ros-ci@v0.2 + - uses: ros-tooling/action-ros-ci@v0.3 with: - target-ros2-distro: rolling + target-ros2-distro: iron diff --git a/.github/workflows/build_and_test_rolling.yaml b/.github/workflows/build_and_test_rolling.yaml index 3651c60..7fee75d 100644 --- a/.github/workflows/build_and_test_rolling.yaml +++ b/.github/workflows/build_and_test_rolling.yaml @@ -26,9 +26,9 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: ros-tooling/setup-ros@v0.3 + - uses: ros-tooling/setup-ros@v0.7 with: use-ros2-testing: true - - uses: ros-tooling/action-ros-ci@v0.2 + - uses: ros-tooling/action-ros-ci@v0.3 with: target-ros2-distro: rolling diff --git a/README.md b/README.md index a69d551..fc74aae 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ # Robot-to-Robot communication in RoboCup SPL -[![Build and Test (foxy)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_foxy.yaml/badge.svg?branch=foxy)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_foxy.yaml?query=branch:foxy) -[![Build and Test (galactic)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_galactic.yaml/badge.svg?branch=galactic)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_galactic.yaml?query=branch:galactic) -[![Build and Test (humble)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_humble.yaml/badge.svg?branch=humble)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_humble.yaml?query=branch:humble) -[![Build and Test (rolling)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_rolling.yaml/badge.svg?branch=rolling)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_rolling.yaml?query=branch:rolling) -[![Build and Test (dev)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_dev.yaml/badge.svg?branch=dev)](https://github.com/ros-sports/r2r_spl/actions/workflows/build_and_test_dev.yaml?query=branch:dev) +[![Build and Test (humble)](../../actions/workflows/build_and_test_humble.yaml/badge.svg?branch=humble)](../../actions/workflows/build_and_test_humble.yaml?query=branch:humble) +[![Build and Test (iron)](../../actions/workflows/build_and_test_iron.yaml/badge.svg?branch=rolling)](../../actions/workflows/build_and_test_iron.yaml?query=branch:rolling) +[![Build and Test (rolling)](../../actions/workflows/build_and_test_rolling.yaml/badge.svg?branch=rolling)](../../actions/workflows/build_and_test_rolling.yaml?query=branch:rolling) ROS2 package that handles intra-team communication using SPLStandardMessage defined in the RoboCup SPL rulebook. From 42f558b32a8a94450af2aaf34a787f4358696e03 Mon Sep 17 00:00:00 2001 From: Kenji Brameld Date: Sat, 30 Dec 2023 03:12:15 +0000 Subject: [PATCH 2/2] split off iron branch Signed-off-by: Kenji Brameld (cherry picked from commit d773c70ef5a7eb644246aadbc0d512b322513078) --- .github/workflows/build_and_test_iron.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test_iron.yaml b/.github/workflows/build_and_test_iron.yaml index 677fd61..b483651 100644 --- a/.github/workflows/build_and_test_iron.yaml +++ b/.github/workflows/build_and_test_iron.yaml @@ -6,11 +6,11 @@ name: Build and Test (iron) on: # Triggers the workflow on push push: - branches: [ rolling ] + branches: [ iron ] # Triggers the workflow on pull requests pull_request: - branches: [ rolling ] + branches: [ iron ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: