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

RHEL support #694

Merged
merged 7 commits into from
Jun 13, 2024
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
23 changes: 15 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
- ubuntu:20.04
- ubuntu:22.04
- ubuntu:24.04
- almalinux:8
- almalinux:9
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4.0.2
Expand Down Expand Up @@ -94,18 +96,11 @@ jobs:
shell: cmd
if: matrix.os == 'windows-latest'

test_ros_binary_install_ubuntu:
test_ros_binary_install_linux:
name: "Check ROS distribution"
strategy:
fail-fast: false
matrix:
ros_distribution:
- noetic
- humble
- iron
- jazzy
- rolling

# Define the Docker image(s) associated with each ROS distribution.
# The include syntax allows additional variables to be defined, like
# docker_image in this case. See documentation:
Expand All @@ -123,6 +118,10 @@ jobs:
ros_distribution: humble
ros_version: 2

- docker_image: almalinux:8
ros_distribution: humble
ros_version: 2

# Iron Irwini (May 2023 - November 2024)
- docker_image: ubuntu:jammy
ros_distribution: iron
Expand All @@ -133,11 +132,19 @@ jobs:
ros_distribution: jazzy
ros_version: 2

- docker_image: almalinux:9
ros_distribution: jazzy
ros_version: 2

# Rolling Ridley (see REP 2002: https://www.ros.org/reps/rep-2002.html)
- docker_image: ubuntu:noble
ros_distribution: rolling
ros_version: 2

- docker_image: almalinux:9
ros_distribution: rolling
ros_version: 2

# ROS 1 tests only run on Ubuntu
container:
image: ${{ matrix.docker_image }}
Expand Down
19 changes: 14 additions & 5 deletions __test__/main.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as core from "@actions/core";
import * as actions_exec from "@actions/exec";

import * as linux from "../src/setup-ros-linux";
import * as ubuntu from "../src/setup-ros-ubuntu";
import * as rhel from "../src/setup-ros-rhel";
import * as osx from "../src/setup-ros-osx";
import * as windows from "../src/setup-ros-windows";

Expand All @@ -16,8 +17,12 @@ describe("basic workflow tests", () => {
jest.restoreAllMocks();
});

it("run Linux workflow", async () => {
await expect(linux.runLinux()).resolves.not.toThrow();
it("run Ubuntu workflow", async () => {
await expect(ubuntu.runLinux()).resolves.not.toThrow();
});

it("run RHEL workflow", async () => {
await expect(rhel.runLinux()).resolves.not.toThrow();
});

it("run Windows workflow", async () => {
Expand All @@ -39,8 +44,12 @@ describe("required-ros-distributions/noetic workflow tests", () => {
jest.restoreAllMocks();
});

it("run Linux workflow", async () => {
await expect(linux.runLinux()).resolves.not.toThrow();
it("run Ubuntu workflow", async () => {
await expect(ubuntu.runLinux()).resolves.not.toThrow();
});

it("run RHEL workflow", async () => {
await expect(rhel.runLinux()).resolves.not.toThrow();
});

it("run Windows workflow", async () => {
Expand Down
Loading
Loading