Skip to content

Commit

Permalink
Try installing python3-flake8 from noble-proposed
Browse files Browse the repository at this point in the history
Signed-off-by: Christophe Bedard <christophe.bedard@apex.ai>
  • Loading branch information
christophebedard committed Mar 27, 2024
1 parent c8a95d1 commit 0876b68
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
10 changes: 10 additions & 0 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7281,6 +7281,16 @@ function runLinux() {
}
// Install development-related packages and some common dependencies
yield apt.installAptDependencies(installConnext);
// Workaround for Noble: we need a newer version of python3-flake8
if ("noble" == ubuntuCodename) {
yield utils.exec("sudo", [
"bash",
"-c",
`echo "deb http://archive.ubuntu.com/ubuntu/ ${ubuntuCodename}-proposed restricted main multiverse universe" >> /etc/apt/sources.list.d/ubuntu-${ubuntuCodename}-proposed.list`,
]);
yield utils.exec("sudo", ["apt-get", "update"]);
yield apt.runAptGetInstall([`python3-flake8/${ubuntuCodename}-proposed`]);
}
// We don't use pip here to install dependencies for ROS 2
if (ubuntuCodename === ros1UbuntuVersion) {
/* pip3 dependencies need to be installed after the APT ones, as pip3
Expand Down
11 changes: 11 additions & 0 deletions src/setup-ros-linux.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,17 @@ export async function runLinux(): Promise<void> {
// Install development-related packages and some common dependencies
await apt.installAptDependencies(installConnext);

// Workaround for Noble: we need a newer version of python3-flake8
if ("noble" == ubuntuCodename) {
await utils.exec("sudo", [

Check warning on line 180 in src/setup-ros-linux.ts

View check run for this annotation

Codecov / codecov/patch

src/setup-ros-linux.ts#L180

Added line #L180 was not covered by tests
"bash",
"-c",
`echo "deb http://archive.ubuntu.com/ubuntu/ ${ubuntuCodename}-proposed restricted main multiverse universe" >> /etc/apt/sources.list.d/ubuntu-${ubuntuCodename}-proposed.list`,
]);
await utils.exec("sudo", ["apt-get", "update"]);
await apt.runAptGetInstall([`python3-flake8/${ubuntuCodename}-proposed`]);

Check warning on line 186 in src/setup-ros-linux.ts

View check run for this annotation

Codecov / codecov/patch

src/setup-ros-linux.ts#L185-L186

Added lines #L185 - L186 were not covered by tests
}

// We don't use pip here to install dependencies for ROS 2
if (ubuntuCodename === ros1UbuntuVersion) {
/* pip3 dependencies need to be installed after the APT ones, as pip3
Expand Down

0 comments on commit 0876b68

Please sign in to comment.