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

ci(build-depends.repos): separate repos for humble and nightly #10148

Merged
merged 1 commit into from
Feb 18, 2025

Conversation

xmfcx
Copy link
Contributor

@xmfcx xmfcx commented Feb 18, 2025

Description

Related Issue:

Humble counterpart:

build_depends.repos file is used for pulling the dependencies of this repository while building it, currently used by CI.

With the introduction of autoware-nightly.repos and pinning of the versions in autoware.repos, the management of this file became a bit complicated.

This repository has 2 branches: main and humble. This PR introduces the following configuration for both these:

PRs against main branch & CI that operates on main

They should utilize build_depends_humble.repos that is overridden by build_depends_nightly.repos.

To simplify this, I've added a new action that will overlay one .repos file onto another.

Using this new combine-repos-action these CI workflows now use the overlaid .repos file.

The reason for not having 2 .build_depends.repos files with some duplicate information and going with override option is to simplify version maintenance.

PRs against humble branch

These utilize build_depends_humble.repos as it is. The condition for this case is only triggered by *-differential workflows.

How was this PR tested?

@xmfcx xmfcx self-assigned this Feb 18, 2025
@github-actions github-actions bot added the type:ci Continuous Integration (CI) processes and testing. (auto-assigned) label Feb 18, 2025
@xmfcx xmfcx added the run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Feb 18, 2025
@xmfcx xmfcx force-pushed the ci/build-depends-main branch 13 times, most recently from 90de398 to e8e5b21 Compare February 18, 2025 06:32
Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org>
@xmfcx xmfcx force-pushed the ci/build-depends-main branch from e8e5b21 to 2e895aa Compare February 18, 2025 06:36
@xmfcx xmfcx marked this pull request as ready for review February 18, 2025 07:18
@autowarefoundation autowarefoundation deleted a comment from github-actions bot Feb 18, 2025
Copy link
Member

@mitsudome-r mitsudome-r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

codecov bot commented Feb 18, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 26.76%. Comparing base (b4d9155) to head (2e895aa).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #10148      +/-   ##
==========================================
- Coverage   26.76%   26.76%   -0.01%     
==========================================
  Files        1416     1416              
  Lines      108463   108463              
  Branches    41715    41715              
==========================================
- Hits        29033    29031       -2     
- Misses      76554    76556       +2     
  Partials     2876     2876              
Flag Coverage Δ
total 26.76% <ø> (-0.01%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@xmfcx xmfcx merged commit 0674e20 into main Feb 18, 2025
43 checks passed
@xmfcx xmfcx deleted the ci/build-depends-main branch February 18, 2025 09:13
xmfcx added a commit that referenced this pull request Feb 18, 2025
Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) type:ci Continuous Integration (CI) processes and testing. (auto-assigned)
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants