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

Hotfix/7.4 merge #4213

Merged
merged 9 commits into from
Jul 3, 2023
Merged

Hotfix/7.4 merge #4213

merged 9 commits into from
Jul 3, 2023

Conversation

sergiusens
Copy link
Collaborator

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run make lint?
  • Have you successfully run pytest tests/unit?

Guillaumebeuzeboc and others added 8 commits May 31, 2023 20:28
In remote-build a proxy is used and passed as env var.

When calling rosdep init as root those env var were not forwarded.
This was causing core20 and core22 ROS snap to be unbuildable on
remote-build rosdep doesn't support proxy:
ros-infrastructure/rosdep#271
`ubnutu-core-initramfs` tool changed where `snap-boostrap` is fetched from.
It assumes `snap-bootstrap` from passed `--root` to be used.
Unpack the downloaded snapd debian package to the same directory where
"ubnutu-core-initramfs" debian package is unpacked.
This directory is already passed to the `ubnutu-core-initramfs` tool as `--root`

Signed-off-by: Ondrej Kubik <[email protected]>
Required by "debian/rules clean" call

Signed-off-by: Ondrej Kubik <[email protected]>
Craft Parts 1.19.6 reverts subdir changes in pull and build steps.

Signed-off-by: Claudio Matsuoka <[email protected]>
@codecov-commenter
Copy link

codecov-commenter commented Jun 15, 2023

Codecov Report

Merging #4213 (89c1d50) into main (ae966fc) will not change coverage.
The diff coverage is n/a.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@           Coverage Diff           @@
##             main    #4213   +/-   ##
=======================================
  Coverage   88.98%   88.98%           
=======================================
  Files         296      296           
  Lines       20192    20192           
=======================================
  Hits        17968    17968           
  Misses       2224     2224           
Impacted Files Coverage Δ
snapcraft/parts/plugins/_ros.py 55.23% <ø> (ø)
snapcraft/parts/plugins/kernel_plugin.py 100.00% <ø> (ø)
snapcraft_legacy/plugins/v2/_kernel_build.py 86.66% <ø> (ø)
snapcraft_legacy/plugins/v2/_ros.py 51.61% <ø> (ø)
snapcraft_legacy/plugins/v2/kernel.py 95.74% <ø> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@mr-cal
Copy link
Collaborator

mr-cal commented Jun 15, 2023

For the failing linter spread test:

There was a spread test fix done on main and hotfix/7.4.

@cmatsuoka reverted it on main today (#4212), I think the same commit needs to be discarded or reverted in this PR.

@mr-cal
Copy link
Collaborator

mr-cal commented Jun 19, 2023

Today, that same spread test started breaking again on main, so it's probably going to work here now.

Edit: I fixed the test in main with #4223

@sergiusens sergiusens merged commit f535c95 into main Jul 3, 2023
@sergiusens sergiusens deleted the hotfix/7.4-merge branch July 3, 2023 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants