Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Drop Foxy support #49

Merged
merged 2 commits into from
Jun 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/eol-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
paths:
- "ros2-dashing-**.sh"
- "ros2-eloquent-**.sh"
- "ros2-foxy-**.sh"
- "ros2-galactic-**.sh"
- ".github/workflows/eol-installers.yml"
pull_request:
Expand All @@ -14,6 +15,7 @@ on:
paths:
- "ros2-dashing-**.sh"
- "ros2-eloquent-**.sh"
- "ros2-foxy-**.sh"
- "ros2-galactic-**.sh"
- ".github/workflows/eol-installers.yml"
schedule:
Expand All @@ -30,6 +32,16 @@ jobs:
# run: |
# ./.test/bats/bin/bats ./.test/test-os-check-bionic.bats

os-check-on-ubuntu-focal:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Run bats test
run: |
./.test/bats/bin/bats ./.test/test-os-check-focal.bats

# dashing-ros-base-main:
# runs-on: ubuntu-18.04
# steps:
Expand Down Expand Up @@ -82,6 +94,31 @@ jobs:
# sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=eloquent/g' -i tutorial.sh
# bash <(head -n -2 ./tutorial.sh)

foxy-ros-base-main:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Run the install script
run: |
./ros2-foxy-ros-base-main.sh
- name: Run the test script
run: |
sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
sed -e 's/^\(source \/opt.*bash\)$/\1\nrosdep install -r -y -i --from-paths ./g' -i tutorial.sh
bash <(head -n -2 ./tutorial.sh)

foxy-desktop-main:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Run the install script
run: |
./ros2-foxy-desktop-main.sh
- name: Run the test script
run: |
sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
bash <(head -n -2 ./tutorial.sh)

galactic-ros-base-main:
runs-on: ubuntu-20.04
steps:
Expand Down
37 changes: 0 additions & 37 deletions .github/workflows/installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,18 @@ on:
branches:
- main
paths:
- "ros2-foxy-**.sh"
- "ros2-humble-**.sh"
- ".github/workflows/installers.yml"
pull_request:
branches:
- main
paths:
- "ros2-foxy-**.sh"
- "ros2-humble-**.sh"
- ".github/workflows/installers.yml"
schedule:
- cron: "0 1 * * 1"

jobs:
os-check-on-ubuntu-focal:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Run bats test
run: |
./.test/bats/bin/bats ./.test/test-os-check-focal.bats

os-check-on-ubuntu-jammy:
runs-on: ubuntu-22.04
steps:
Expand All @@ -38,31 +26,6 @@ jobs:
run: |
./.test/bats/bin/bats ./.test/test-os-check-jammy.bats

foxy-ros-base-main:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Run the install script
run: |
./ros2-foxy-ros-base-main.sh
- name: Run the test script
run: |
sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
sed -e 's/^\(source \/opt.*bash\)$/\1\nrosdep install -r -y -i --from-paths ./g' -i tutorial.sh
bash <(head -n -2 ./tutorial.sh)

foxy-desktop-main:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Run the install script
run: |
./ros2-foxy-desktop-main.sh
- name: Run the test script
run: |
sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
bash <(head -n -2 ./tutorial.sh)

humble-ros-base-main:
runs-on: ubuntu-22.04
steps:
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@ on:
- cron: "0 1 * * 1"

jobs:
foxy:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Run the install script
run: |
sed -e 's/^\(CHOOSE_ROS_DISTRO=.*\)/#\1\nCHOOSE_ROS_DISTRO=foxy/g' -i run.sh
./run.sh
- name: Run the test script
run: |
sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
bash <(head -n -2 ./tutorial.sh)

humble:
runs-on: ubuntu-22.04
steps:
Expand Down
2 changes: 1 addition & 1 deletion ros2-foxy-desktop-main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ sudo apt-get install -y python3-colcon-common-extensions
sudo apt-get install -y python3-rosdep python3-vcstool # https://index.ros.org/doc/ros2/Installation/Linux-Development-Setup/
[ -e /etc/ros/rosdep/sources.list.d/20-default.list ] ||
sudo rosdep init
rosdep update
rosdep update --include-eol-distros # https://discourse.ros.org/t/rosdep-and-eol-distros/7640
grep -F "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" ~/.bashrc ||
echo "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" >> ~/.bashrc
grep -F "source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash" ~/.bashrc ||
Expand Down
2 changes: 1 addition & 1 deletion ros2-foxy-ros-base-main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ sudo apt-get install -y python3-colcon-common-extensions
sudo apt-get install -y python3-rosdep python3-vcstool # https://index.ros.org/doc/ros2/Installation/Linux-Development-Setup/
[ -e /etc/ros/rosdep/sources.list.d/20-default.list ] ||
sudo rosdep init
rosdep update
rosdep update --include-eol-distros # https://discourse.ros.org/t/rosdep-and-eol-distros/7640
grep -F "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" ~/.bashrc ||
echo "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" >> ~/.bashrc
grep -F "source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash" ~/.bashrc ||
Expand Down