Skip to content

Commit

Permalink
Remove bionic (#57)
Browse files Browse the repository at this point in the history
Signed-off-by: Emerson Knapp <[email protected]>
  • Loading branch information
emersonknapp authored Sep 5, 2023
1 parent 7af6566 commit a53a8b2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
base_image_name: [ubuntu]
base_image_tag: [bionic, focal, jammy]
base_image_tag: [focal, jammy]
name: "${{ matrix.base_image_name }}-${{ matrix.base_image_tag }}"
# always use latest linux worker, as it should not have any impact
# when it comes to building docker images.
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Base Linux distribution used to build the Docker image
#
# The script has been tested against:
# - ubuntu:bionic
# - ubuntu:focal
# - ubuntu:jammy
#
Expand All @@ -11,7 +10,7 @@
# This script will not work with non-APT based Linux distributions.
ARG BASE_IMAGE_NAME

# Base Linux distribution version (one of "bionic", "focal", "jammy")
# Base Linux distribution version (one of "focal", "jammy")

ARG BASE_IMAGE_TAG

Expand Down
21 changes: 1 addition & 20 deletions setup-ros.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,9 @@ apt-get install --no-install-recommends --quiet --yes tzdata
update-ca-certificates
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg

case $(lsb_release -sc) in
"bionic")
ROSDEP_APT_PACKAGE="python-rosdep"
;;
*)
ROSDEP_APT_PACKAGE="python3-rosdep"
;;
esac

ROS_VERSION="ros"
RTI_CONNEXT_DDS=""
case ${ROS_DISTRO} in
"none")
case $(lsb_release -sc) in
"bionic")
ROS_VERSION="ros"
;;
*)
ROS_VERSION="ros2"
;;
esac
;;
"noetic")
ROS_VERSION="ros"
;;
Expand Down Expand Up @@ -85,7 +66,7 @@ apt-get install --no-install-recommends --quiet --yes \
python3-pip \
python3-vcstool \
python3-wheel \
${ROSDEP_APT_PACKAGE} \
python3-rosdep \
${RTI_CONNEXT_DDS} \
wget

Expand Down

0 comments on commit a53a8b2

Please sign in to comment.