From f257a288257219dedc06ea78b5b9e1a1c2df8261 Mon Sep 17 00:00:00 2001 From: Kenji Brameld Date: Tue, 13 Jun 2023 00:37:19 +0000 Subject: [PATCH] update for iron Signed-off-by: Kenji Brameld --- .devcontainer/Dockerfile | 10 ---------- .devcontainer/devcontainer.json | 9 --------- ...ild_and_test_foxy.yaml => build_and_test_iron.yaml} | 8 ++++---- README.md | 3 +-- 4 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json rename .github/workflows/{build_and_test_foxy.yaml => build_and_test_iron.yaml} (86%) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index f9085c7..0000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM osrf/ros:rolling-desktop-full - -# Update all packages -RUN apt update && apt upgrade -y - -# Rosdep update -RUN rosdep update - -# Source the ROS setup file -RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index 0ccd5d4..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dockerFile": "Dockerfile", - "workspaceMount": "source=${localWorkspaceFolder},target=/ws/src/${localWorkspaceFolderBasename},type=bind", - "workspaceFolder": "/ws", - "runArgs": [ - "--privileged", - "--network=host" - ] -} diff --git a/.github/workflows/build_and_test_foxy.yaml b/.github/workflows/build_and_test_iron.yaml similarity index 86% rename from .github/workflows/build_and_test_foxy.yaml rename to .github/workflows/build_and_test_iron.yaml index bd734b6..906ed0a 100644 --- a/.github/workflows/build_and_test_foxy.yaml +++ b/.github/workflows/build_and_test_iron.yaml @@ -1,8 +1,8 @@ # This is a basic workflow to help you get started with Actions -name: Build and Test (foxy) +name: Build and Test (iron) -# Controls when the action will run. +# Controls when the action will run. on: # Triggers the workflow on push push: @@ -22,7 +22,7 @@ jobs: # The type of runner that the job will run on runs-on: ubuntu-latest container: - image: ubuntu:focal + image: ubuntu:jammy # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -31,4 +31,4 @@ jobs: use-ros2-testing: true - uses: ros-tooling/action-ros-ci@v0.3 with: - target-ros2-distro: foxy + target-ros2-distro: iron diff --git a/README.md b/README.md index d40e1b7..c64ee00 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Template Repo -[![Build and Test (foxy)](../../actions/workflows/build_and_test_foxy.yaml/badge.svg?branch=rolling)](../../actions/workflows/build_and_test_foxy.yaml?query=branch:rolling) [![Build and Test (humble)](../../actions/workflows/build_and_test_humble.yaml/badge.svg?branch=rolling)](../../actions/workflows/build_and_test_humble.yaml?query=branch:rolling) +[![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) -